Change to use the UX that was suggested most recently in the PR.