Backout changeset 84e8e319f735 for breaking rootanalysis build.