Backed out bug 691594. a=bajaj