Backout 8461f75fd62b (bug 809949) for breaking the build on a CLOSED TREE