Repost of earlier patch.

Regards,

Anthony Liguori