Revert "Bring up 4.9 and other good stuff"

This reverts commit 2c0ab87c16720810402251ef40fb476f7c39857e.