Is CHAdeMO headed for CHAde-NO?