Revert "downgrade to 1.6"

This reverts commit 56d772eb99d054f5e48f2ae6edfe8e61b0ef6bc8.