Remove backported patch which is now included in the upstream release. Signed-off-by: Daniel Golle <daniel@makrotopia.org> (cherry picked from commit d7799595bd)
d7799595bd