Revert "1.7 Update"

This reverts commit 829e5608ba5001ea89f8ecd12adfe413f72dfcc1.