Restoring ragged line endings

They'd be nice to remove eventually, but leaving them in for now will make merges simpler.