Don't set the column to size zero if it's not needed but don't add it at all.
Authored by: steveking 2015-10-15
Parent: [r1083]
Child: [r1085]
