Try reverting app, util changes