Revert "some 1.8 updates"

This reverts commit e9d1e38a7eb1cb5f10c8055be5c09a31232476f6.