1b5e43a5 relied on a patch that we can't backport.
This adds that extra internal boolean backporting just the tiny part of d6ac8cf6.