From: Aurelien Jarno <aurelien@xxxxxxxxxxx> commit 6df2a016c0c8a3d0933ef33dd192ea6606b115e3 upstream.