Merge request for stable branch.
This reverts commit 40e5ac45.
The reverted commit caused crashes in various games. Crashes don't occur in master since enabling NIR by default (commit 75ce078a).