OK, I pushed the revert patch to my stable/for-next branch. Adding Jiri to Cc to inform that. To master branch, I'm not sure yet; it's supposed to be a temporary workaround until the X driver gets fixed.