Revert "Okay, derped the first push. This should be better."

This reverts commit c83d4536783c0f27696b059a5c99795bdf2babc7.