This reverts commit ea6e8775bd. The new format is not an improvement.
ea6e8775bd
[Squashed commits to make git blame etc. more likely to work. -ED]