Fix #16495: Broken custom field API