Revert "re-enable hack."

This reverts commit 6d69e5b2aa021450787a99b29291209b00f4f8b9.