Revert r75769, r80475: mistaken attempt to fix bug 25725 by deleting random newlines...