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

This reverts commit 61c99caac6ebcf196dca5b5fc0b6c9ca459c9198.