Revert "Added ability to allow for free-from text entry on combobox (see notes in header comments)"

This reverts commit a4e7ccb0a9c10122d0b199bc729cd4ea15e9be80.