New ADB versions need this