Revert "4.9 isn't working"

This reverts commit 5374804fd9ed6b882fde70916b5c3cf20de50c06.