Revert "Hackity hack"

This reverts commit bd4790b723b43af35ccc16c1736664e9b9183a3a.