Revert to 2.9.0 state to allow for bug fixing.

Do new development in a branch.
[jan] Fix dependency.