GitLab

This reverts commit 5319dd9b.
This is already applied in Kernel.

Change-Id: Ic07a66f4e2d9dbd3651ab6be0493bdedfbed72aa