Backed out changesets bde36c2eacc0 and 8dc40bbe844e (bug 862088) for causing bug 875769.