Revert "1.6"

This reverts commit 7346408d0721828370a30487a127f6607f15aceb.