0d5c9bf1e4
This reverts commit 54e30dbf4d.
Will investigate after XDC.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=84557