Revert "Merge pull request #10166 from lodr/bug-877990-performance-limits"

This reverts commit 742caa314f950159603a92e08b423b76486f7ffe, reversing
changes made to f9318db4067b23842b3ac16bc2956a6e3c38e306.