Back out e1d71b13e35f (Bug 853337) for crashes on a CLOSED TREE