Revert e503e8d..23880a7

This rolls back to commit e503e8d3ecf02352405fd575b3757bba9850aa85.