[#861816] Updates to using makeapi.