ae6d3fbdd0
This reverts commit 946bf93dfb.
Temporarily reverting until the driver side of this is upstream
Change-Id: I2d8243208c1271ebad90bc2ee0fda2dfefb0831b