for #19453

I don't know how to test this in the server without a significant
refactor.
# Checklist for submitter
If some of the following don't apply, delete the relevant line.
<!-- Note that API documentation changes are now addressed by the
product design team. -->
- [ ] Added/updated tests
- [x] Manual QA for all new/changed functionality