Comment 3 for bug 607512

I've just pushed my first revision of a fix for this. It's not ready for merge yet (I want to un-spaghettify it, possibly remove the dependency on boto and add unit tests), but I'm not feeling too good today, and will be away for the weekend, so I'd rather share it to avoid wasted effort for others.