Revert "temp band aid fix for perf issues"

This reverts commit a8d93a92cce08cc058e4543d113ed49a18f25286.