commit 2d1c18bb upstream.

This breaks too many things.

bugs:
https://bugzilla.kernel.org/show_bug.cgi?id=99041
https://bugs.freedesktop.org/show_bug.cgi?id=90681

This reverts commit 0f55db36.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>