Upgrade to Okapi 0.22; remove workaround for https://code.google.com/p/okapi/issues/detail?id=342