Add back old patch