Abandoned this branch, see note in changes.txt.