Revert "for ADB fix"

This reverts commit a8e0a034eb644301a9b1b7444f07d0fc6d8b5100.