roll back to omnibus 3.2.2 compatibility