Revert "1.7 Update"

This reverts commit 085128009c41694a3b484337f55665d88c5fd2d0.