7770b02693
This reverts commit 5ceadd29b0.
I rebased and apparently failed to build test.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75355