Merge "Revert "Extend hack to new driver version""