Revert e249ca3..fec75a5

This rolls back to commit e249ca3be83e75a26710d81ce5ad95c3404f78d5.