Revert "version1-6"

This reverts commit bfafa9e061bb67cadfd8259d484986d0f27aef5a.