Revert "I sure hope this doesn't break everything."

This reverts commit f9424fc2a6673dc3b2a1804926e09cc2760dbea5.