Revert "Deciding to relocate ComprehensionBlock"

This reverts commit b5ecde9295e071944d2a77ca377904b06446d333.