Backed out changeset 46cf8e706620 (bug 1008969) for depending on bug 1008917 which was already backed out to fix a CLOSED TREE