Backed out changeset 6db486ed2de1 (bug 1085291) for breaking Builds on a CLOSED TREE