Revert e9a2bed..c351dc4

This rolls back to commit e9a2bedefde647b5c853fb0dec2314f0ded9f2a4.