Revert "hack"

This reverts commit f581a816b608f6a8007c6ceabe44fedc0510a08d.