Revert committed to our stable kernel branch. Upstream developers claim that it was / will be fixed differently upstream, but this time I will test it first, instead of blindly trusting them.