Revert "Fix?"

This reverts commit cbb2d6996837f1a64b094518b41bda821c074ceb, reversing
changes made to 35be466cce64b9efffca6fc10b44d151d30050fc.
Roll back.