Revert "Revert "WTF WTF TWTF""

This reverts commit a2b4a0882bbcf8d987a35b3af2d5ffd5e701ba38.