Revert "Bring up 4.9 and other good stuff"

This reverts commit 8fcc874babc515f73abe8bdba7318592083d0ea3.