Maybe we ought to just go with the Rails patch?