Resending patch (properly formatted this time I hope).