Revert "sync: driver commits"

This reverts commit 268c1036ecf11fda1ecc9eda225f13b27264e228.