Revert "Here we come, 4.9"

This reverts commit b6d99cefe29f8880e898ce925d376093bc13a3a2.