r22673: Fix for Jerry's reversion. We still need to check size