Revert code changed in the branching test we did on 6/4.