MOBILE-168 Reverting, the app crashes...