The previous PR contained a code smell reported on sonarcloud: https://sonarcloud.io/project/issues?sinceLeakPeriod=true&issueStatuses=OPEN%2CCONFIRMED&branch=stable-16.10.x&id=org.xwiki.platform%3Axwiki-platform&open=AZbyyFuFawS2eEWuxMIb&tab=code Started a PR with a fix for this at https://github.com/xwiki/xwiki-platform/pull/4189
