Well, as of this weekend's AGM you can do either.
However, whether the ECE man is ready for the change is something you need to check with him on.
I suspect the whole DIY/ECE team will need to work through the procedures and create some guidance for mandatory over the coming weeks/months.
But, whatever, talk to Martin!