Bug 881634 - Backout 1c39ca9daa6c for causing bug 911502. a=bajaj CLOSED TREE