Back out UI changes on primary branch