Backed out changeset 96e274a243ff (bug 998396) for build failures; CLOSED TREE