No more arbitrary truncation of lines at 4

Change-Id: Ibea3cd5d664052c99b10629a5a5cd45a3b56c4b0