PISS Revert "removed some cruft and shit that wasn't working"

This reverts commit 74477331f561c0146b7377fe6987ac3cfccb8842.