We have a user report that the change in #7799 causes their shaders to compile 2-3x slower than previously.
