you should commit the fix you had on that ticket. it's orthogonal to this discussion, iirc