Put back code lost since 2a8962aa95ba5f8b11439bfe3e9ecc88decb2c88

Signed-off-by: Marc Delisle <marc@infomarc.info>