Revert d22e191..e76c20d

This rolls back to commit d22e191346dad37ac13e2402e258ae5c726b8f36.