The fix does not fix the case of shaders comming from the OpenSubdiv API. This reverts commit f5191b8760.
f5191b8760