Revert "Back to 4.9 for the moment"

This reverts commit a501e83e16665394f779798076cda65f783c72b5.