Rearrange logiv for OneSix version change