This commit caused Ticket1490 (Infinity loop / lock in export image)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>