Backout bug 848764 because of bug 886736 and bug 907957. a=bajaj