Put listboxes back.

From #5360.