Revert 5337dca..4ac787c

This rolls back to commit 5337dca947f61d0115c9244f87730115ab5658e1.