Revert 024e656..4e778e7

This rolls back to commit 024e656f9a0550016e53570e4d853ae2a3e07019.