* Revert "Performance tweaks (#4340)" This reverts commit 55cee5742f1e5193df6ba1805ec0229b4a2f3b18. * Revert Rc change