OA-584 Remove patches entirely.