Revert 6b64602..234a740

This rolls back to commit 6b646026578b4f170a33dbc7af93386c3e35a16f.