Kevin-B Yeah, I totally get the scenario here... I just got done working with the support organization to update / clarify the guidance that we have for our support agents for this scenario. It was not quite as spelled out as it should have been. Basically - support engineers cannot make this change for you and you cannot do it by yourself in the month of September (because the diagnostics is in opt-out only mode). What needs to happen is that support engineers can escalate the support ticket to the team who can make the auth change for you within the month of September. Starting October, this will not be a problem anymore because the diagnostics will move to "re-enablement" mode. But in September a ticket is needed.
Sorry about the confusion on this; we should have documented this better internally.
EDIT: I have now updated the graphics / flowchart in this post to account for this scenario in September.