Revert b5b7436..49f51c8

This rolls back to commit b5b743643fd6f4e34e06ce57b55d12363a028198.