revert performance optimization fix