Revert e61c5d3..5f5a332

This rolls back to commit e61c5d32390e3d1a6cfc48c74090e74598f7a8fe.