Revert e1d858a..1d5b3a1

This rolls back to commit e1d858ab8e54d5b87246e4ca22ae11e12720ade6.