Revert 72f01f6..8009624

This rolls back to commit 72f01f6c5fff6ea9f2c8bde82a4802063cf20d62.