Bug 853522 - Backout changeset e988bcfd097c - r=jacob a=bajaj