update stub and drive
Revert "update stub and drive"

This reverts commit a94b0110c19cc518a6633b3433e57b7411e85246.