Backed out changeset 1cce9c56538f (bug 1087633) for static analysis bustage.