Continue reverting r115363.