Re-add support for Android 2.2 & 2.3 (albeit with whitelist functionality currently disabled)