Revision of a criteria for #84294