Back out 0c8c2c9bd609 (bug 927204) for rootanalysis bustage