Rev 116855. Leaving bug open because of mark ring issue.