Revert "Revert "revert 'hack'""

This reverts commit 0e73702cab3bef4c0503eddf0365d40897b13fd2.