Back out bug 839103 for build errors on a CLOSED TREE