revert performance improvement, because it break the behavior with big number