Revert back Adb user build