Revert "for performance"

This reverts commit def81d8b186ded17998e083076680adf3789c10f.