Backed out changeset 2f858de5e9dc (bug 952505) for Werror bustage.