remove fix of ZK-1711 for performance impact