Revert 0652c02..4c5bec5

This rolls back to commit 0652c02da40f2e3579e33e7ed7c1c62002477b8c.