Backed out changeset 3265d1e6ed10 (bug 890938) for Werror bustage.