Revert e64dff5..c537a13

This rolls back to commit e64dff52a1ef5b9c4fed80e5626b8f38364e207b.