Revert dac8388..a575526

This rolls back to commit dac838852164c945ee84696e761de8fd775139ec.
'PickerFlowLayout' => 'TableFlowLayout'