Backed out changeset 73bb0c592bf1 (bug 998396) for debug build failures; CLOSED TREE