Due to the update, this commit also drops the upstream patch.

Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>