Due to update, this commit also drops the patch that was merged upstream. Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>