Revert "1.6 start"

This reverts commit 7e8dbf8eed5508e446618d5e5d897387d77590aa.