Backed out changeset c40ecf876d68
Merge backout from stable.