Backed out changeset 21f094a18c5c (bug 837199) for Werror bustage.
CLOSED TREE