Revert 59cc6f2..e655127

This rolls back to commit 59cc6f266e9a570eb950e853ec0801f3f88929d7.