imported patch cache2/914644-doomed-handles.patch