I don't think we need that patch anymore