Undo regression (retaining file ownership) introduced in 53f1a928fdf299f1d150b7b935270e44299b3b2a