reapplying the patch, just line number changes