Revert "1.7"

This reverts commit c9719ebe843466b79239030c58a1fd3e22ddd365.
Revert "1.7"

This reverts commit 32c022b24cb2c1fe605858279d49dfe556a7f774.