In light of recent changes by Jeroen, #124515 seems to have been resolved properly, rather then using this workaround. This also sidesteps the issue seen in #136633 which only happens when GPU sibdiv is disabled. Pull Request: https://projects.blender.org/blender/blender/pulls/136678