Backed out changeset 8421bc750585 (bug 888864) for Werror bustage.