Backed out changeset 1028c462d120 (bug 518592) for Werror bustage on a CLOSED TREE.