MOBILE-201 Reverting some changes