Backed out changeset 707307cc53a6 (bug 897160)