Revert 34bf4e2..ac665e7

This rolls back to commit 34bf4e250a6466e8d54c89d4b78571bc7e0bf42b.