I think this change should be version'd for Android, not for every other system.