Revert 0573612..9b99dfe

This rolls back to commit 05736123c8d95b61a34161c5dcb235fd8505ad0a.