Revert 8217af6..3a64655

This rolls back to commit 8217af62a9dfb0093f6520f1ebe300ce949c0258.