It is a better workaround to #3075 and it makes preparsing return the ES list
(not yet perfect for that).
(cherry picked from commit 46576f85)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>