Revert "WTF WTF TWTF"

This reverts commit d9837761b2a7e3a7d86a9aeb5bc81e429be31994.