Rolling back along with reverted driver drop This reverts commit fc00a1d4. Change-Id: I58e23d7782254824d023ce4973a75ba5d0c1f367