Mistake in reverting 131932629, this was reverted in 132126969

I saw your previous comment and I will be reverting the other changesets as well. Thanks.