Revert "update to latest 1.8"

This reverts commit 27a36faf5b2233ac5e87e84de4cbde08f2659137, reversing
changes made to acd31313057826cd1f96371bbad2980026cffb96.