revert 2bd96de1a3d0c6486397dd10c2bb98ad3326205c to avoid performance problem calculat...