fix(driver-compat) revert changes introduced in 42070f882f46e852a8b52851d6fb9ee3cc2afe52 and 149aa0bbdb67f5d6aa6b4c6d56701447d717b110