upstream-16cde6c32f.diff
