Fossil SCM

Undo all changes associated with [b54de50ac5] and merge that branch into the trunk. We do not want to have an open branch in the official repository that yield a fundamentally incompatible version of the program.