Revert "Take out combobox so we can check/fix/prune it."

This reverts commit e663b4140c8b15c1c3327e6bd5bffb368fcea4e9.