remove fix of ZK-1711 for performance impact
Merge pull request #326 from VincentJian/B65-ZK-1711

remove fix of ZK-1711 for performance impact