Hey Neil,
You're totally right, we messed up here. Not only were we slow to come up with a solution, but when we did we weren't coordinated on it.
The solution I presented above is brand new, and all the teams have just been briefed on it. Just double-checked with the Support team that everyone's aware of the change.
Once again, thanks for the feedback, it really helps us maintain an awesome product and service.