Backout of 640b31a66dfe due to regression. [r=me] [a=bbajaj]