Bug 1040070 - Follow-up, revert change to default number of columns r=me