---
fixes:
- |
Change Id905d47600bda9923cebae617749c8286552ec94 is causing gate failures
with the generic driver so we need to revert it for now and revisit after
rc.