Fixes https://github.com/letsencrypt/boulder/issues/3112 Fixes https://github.com/letsencrypt/boulder/issues/7063