Backed out changeset d3954ec849a1 (bug 855643). a=akeybl DONTBUILD