Fixed #23112 -- remove unnecessary list_choices