Oops, committed that part by accident. Backing out by now.
Akonadi 1.9.1, now correct version in the correct commit.