various horrible changes
Revert "various horrible changes"

This reverts commit e7629b8472f4b82396ab49fe13f13024d9421e6f.