Reverting the main_app changes