Fixes #16509 by making the change from #15938 less strict. This is technically a hole, but it's not as big a hole as before #15938.