Revert breaking change in UI