Revert ee1b0f0..1acd35a

This rolls back to commit ee1b0f04ac4254f995efc8e84733c2326d3cb5be.