Revert "major fucking surgery"

This reverts commit 2d792e74b94955f240f119a97934634d33a7825d.