partially revert UI change from #37870