"merge" the "fix" from zenphoto.

Of course nothing has changed since the fix was first lifted from us.