Can we land this patch w/o also changing the MakeAPI?