Revert "v1.6"

This reverts commit 6effef33fcc824311fa08e5f59c58838f32e7eb9.