Don't use backed up disk for indices of rederivable references.
Merge remote-tracking branch upstream/$:{upbranch}