I'm inclined to go with the rails patch as it came from rails and has already (ostensibly) been tested.  Also, then we'll be able to remove this in the future once we upgrade to whichever version of rails that patch goes into.