Fix build breakage after deprecated API removal merge