This issue was created in anticipation that I wouldn't find a solution for a regression created in XWIKI-21009 before the release of 16.0.0rc1. I did find a solution and labelled the PR with this issue.