Reverting changes I accidently made in r34507.