Trying to make diff-root work in master again (and make Overlay CI pass).
Looks OK together with !22163 (merged).
/cc @ssnyder @jchapman