Scary oversight? Trim linefeeds

Change-Id: Id3341f9d111018cd9ed7ec0cff25e4ef3c776cdd