Backport fix for incorrect assumption about in-memory zval type