Switch from wombat

It does not play well with diffs.
...