really fixing the API merge this time