Revert ohai to v6