Postpone 2.6 for now