Per https://bugs.freedesktop.org/show_bug.cgi?id=35016#c11 (Chris Wilson) the proper fix for this is indeed to revert commit c2e0eb167070a6e9dcb49c84c13c79a30d672431.
Per https:/ /bugs.freedeskt op.org/ show_bug. cgi?id= 35016#c11 (Chris Wilson) the proper fix for this is indeed to revert commit c2e0eb167070a6e 9dcb49c84c13c79 a30d672431.