Backed out changeset be8677c20b9f (bug 1062623) due to colourful tree