This restores the original logic from
c77ee763
(cherry picked from commit 0aa088cde297e30c8d002767bc2d3bbb570b0f01)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>