Add back ManualDrive and RestoreManualDrive