Revert "1.8"

This reverts commit 93c2c2ac6d9d820e904741df8c6de9f84614a03a.