Straight pick of commit 70c30b1ea706affcb117e3cd3065690abca5ba69 This fix is scheduled for stable but hasn't been added to 4.17 stable tree yet. Once it hits 4.17 this patch can be dropped. Signed-off-by: Matthias Reichl <hias@horus.com>