Backed out changeset 6dfeb2060033 (bug 855643). a=akeybl