This reverts commit efac36b186efe6c3814278ae0a284ae346ff9d83. Reviewed-by: Aleix Boné <abonerib@bsc.es>