backported https://github.com/roots/roots/commit/a19b89f023f7d8532b2b9a57a27d1b426d5fb25c
other backport or fix