Revert d9fbbf5..0bb4b11

This rolls back to commit d9fbbf5040d24f0ce5b459bb837ac1c1963738ab.