Found a case where we use size==0, the other related commits
remain needed, and should be sufficient to fix the original issue

This reverts commit 7e4f32f4.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>