fix data-api portion of #10084