This reverts commit 3c8116c8. It has
been a merge that has been acidentally squashed into one commit with the
consequence that all history has been lost. The next commit will be a
proper merge commit rectifying this.