Revert b724208..0428ce4

This rolls back to commit b7242085107de47253786ff79a478b78bbeb312d.