Fix case where nested API does an additional (unecessary) call back to
the server