Revert "WTF"

This reverts commit a5e3575c30e0f5e72ff7dba846f7b84432786161, reversing
changes made to 60f691cf069088eb85ffc113b794976a07d0bec5.
still