Revert e72d3ff..225038c

This rolls back to commit e72d3ffdb71ecb2d598360ea283eb5fa19678424.