Revert "hack"

This reverts commit cd2c58a25a6ad75fe4cf2c648b9fda0e0957fa77.