Backout bug 947045 for build failures on a CLOSED TREE