Revert 0ed0376..39b9273

This rolls back to commit 0ed03763c004ef952db0b1cf26b5510fc79728e6.