Revert "Drivers changes"

This reverts commit d1d284ce26ce7a3ef57d32b3ea67b9e920698c2a.