Back out bug 925796 and bug 923596 for breaking Metro on a CLOSED TREE