Revert 3881dd1..3f2e930

This rolls back to commit 3881dd137e18953e59a6064873eaaa88ddeaa465.