Revert fe7dffa..b8e048b

This rolls back to commit fe7dffa1f3e8d3f52c385dbbaa69e9557951d842.