Bring in-line with ParanoidAndroid