Revert b3ad46b..ed382c9

This rolls back to commit b3ad46bd9e589f713f1edfc15ddb21d7b5e7f238.
stuff