Backed out changeset 96a507248c53 (bug 1059583) for Werror bustage.
CLOSED TREE