Backed out changeset 1917953b1f89 (bug 961867) on a CLOSED TREE r=bustage