Revert "tweak to improve slightly improve performance"

This reverts commit de287e00dd5c30f778364a671d2455566e1546af.
Revert "Revert "tweak to improve slightly improve performance""

This reverts commit 8ae1a9480cdcf159f7d0eb5dd7d87bc03eaf44dc.