(Chris has a PR with the same kind of logic FWIW)