I don't think this is right.  I've commented on the new diff.