Revert e7c565b..ab11307

This rolls back to commit e7c565b3c1e2438355b682a02817a6c1d8d245d4.