Revert "1.7"

This reverts commit 59bba55d534bdb0f6f14f450b712a6bfa3b6ce4b.