Revert b846191..f6f96bb

This rolls back to commit b846191bfef618fb95f48636eb0c04596d97b332.