Revert b2f9b8e..ad9b322

This rolls back to commit b2f9b8e4dd96c3fc6779f3d3c138b15dc169687b.