Revert 833702e..0f73397

This rolls back to commit 833702edb8695752d2f843440c8e58d6a1de23e6.