Revert 92230cf..5682e5d

This rolls back to commit 92230cf31418d9b9ea5b7bf7b796f2dbb5c1ea48.
stuff

and things