c8813q: CM has merged my commit so remove the patch