Revert "Revert "Revert "Revert "Revert "Here we come, 4.9"""""

This reverts commit 642612e746a32aedeec98b08773d3c286326134d.