Backout of 64df2203966e due to regression. [r=me] [a=bbajaj]