Fixed as part of #8364.