Is this patch correct in any way?
(Ripped out of the 2.5 patch and modified some).

Thanks.