Backed out changeset bc9031f59e1c (bug 1021248) for Werror bustage