Backed out changeset b2995c617e4c (bug 915233) for breaking the build on a CLOSED TREE