Backport the filename escaping fix