Merge "Remove driver workaround" into oc-dev