EBD-12071: step one, correctly handle the new adapter structure of the ebuddy API.