Revert "4.10 AGAIN!"

This reverts commit 869b0bae00dd082ac8df207eaa6d0b95a61ac3c1.