Revert "Revert "temp band aid fix for perf issues""

This reverts commit b9bbcf990ef2ebd646b597a119b7bef0e0f06912.