This is tested with X11 and should fix LP#665298.

This partially reverts commit fb7f0141.
RV24 is left as is because I cannot test it on my GPU.
(cherry picked from commit 37e37fb1)