Comment 1 for bug 681530

I had to revert the fix, because it caused a very nasty regression, much more severe than a few extra photos on the hard drive. The correct fix is not trivial, so I will have to get to it later