Revert "hack it"

This reverts commit 25123a5af3ff182ffe2967421952a1eb94eabd5d.