Revert 7d5a968..479f234

This rolls back to commit 7d5a9689fc023a979ab0caafed3b936a2ad87a17.