Note to self: This change is safe on iOS, should be safe on Android.