Part of https://github.com/letsencrypt/boulder/issues/8944
Part of #8944