Revert "Merge from develop, with ugly results." Because holy shit, they blew it up.

This reverts commit 1073e33cd582c7f077e2bf408f2a55ccf5ddf844, reversing
changes made to 209d6c3f5052b1ceef3400fc5f1493ece4f9b754.