Fix g4850949 (use correct API calls).