Revert 32d6000..00ffbfc

This rolls back to commit 32d6000f2caa0cda3845d7d2ebe1c88b594db1bc.