I think we should discuss the old versus new behavior in a separate issue/PR, as this particular PR did not mean the change the UI/UX.