This is a follow-up to PR #21146, which was unable to be merged without
keeping this flag ignore.