0001-Import-upstream-fix-Closes-987636.patch
