Bug#711958: Does this close also #699559?

[Gerardo Malazdrewicz]

If it does, it does it in a cleaner way than the patch there, IMO.

Thanks,
       Gerardo