Revert 0e00a01..9629c34

This rolls back to commit 0e00a01c162f01bc37508a40169873ad5578e29f.