Port 379c3e237f to glitch-soc, but changing the 5 limit to 10, since that's what we had previously
379c3e237f