Revert d728302..2237acc

This rolls back to commit d72830245ad5f570f3121265502e6ea1f6198ae7.