- Fix patches from #5160 running on the client and causing stutter