Reverted one xfer_dirs change from the last commit that should not