this simplifies the code a lot. We're not going back to 1.0
Signed-off-by: Jean-Louis Naudin <jlnaudin@gmail.com>