Revert "1.7"

This reverts commit 90b36ef590ee0776fd8a9a2858130da0eb6f106b.