issue #21229: be more exclusionary