This reverts commit adab15a30a. Revert to cleanup (the conditional substitution is in another pull request)
adab15a30a