Revert 85952cc..51f5a37

This rolls back to commit 85952ccd9e76c712d1eeee3cebb4f8090f6a14d6.