Put back stuff that were removed by mistake during renaming listbox method commit