This reverts 1c83b6c439 and properly fixes the issue discussed there. This makes git-annex behave much nicer in direct mode.
1c83b6c439