Backed out changeset 2404f5888de3 (bug 864589)