Revert "ComboBox"

This reverts commit cbae1d2b07b57cc1a4b72cdbfbaa179af26dcf54.