upstream-b5cb326.diff
