Boy, I was a bit indistinct but browj2 is correct. Note that if you want to cancel the automatic XDP upgrade next year, you need to do it 8 weeks before it is due!