Temporary: drop dependency on https://github.com/datacratic/soa/pull/22.