Revert "now, this is seriously weird"

This reverts commit 2d15e5d8ad699319bef4efa475ef8cdf50e6f27f.