[#865290] Fix MakeAPI being required in server-side