Roll back from bug 1089697 fixed.