Right, some help here.

I'm getting the annoying org-mode migration notice, and 5 second delay that other people are experiencing.

All the solutions in that thread appear to boil down to: delete org from .emacs.d/elpa, and install it from elpa next time.

But I don't have a "org", or a "org-contrib". I have "org-plus-contrib", but that seems to only be available from Org's ELPA?

(Current setup: Windows 10, emacs from Chocolatey)