Revert "Merge branch '21.9-textGSOptimization' into '21.9'"
This reverts merge request !31888 (merged)
As discussed in initial MR, this change was to assess the impact on CPU performance in SPOT tests, which has now been done, so this update can be reverted.