Reverting to use with omnibus