Backed out changeset fd8e58a613da (bug 1074415) for Linux Werror bustage.
CLOSED TREE