[2022] Hotfix for 3.3.3. out

Originally posted by Elitewrecker PT: It removes that fix, which is what caused the slowdown apparently.

Its a partial reversion of that fix, yes. Its a case where edge cases could cause unintended consequences.