Allow column labels. Part of fix for BZ-1032183.
(cherry-picked from 15497aa)