Reverted r86072, r86419 per CR. Lots of conflicts resolved here. Removes lineStart...