This reverts commit 1eac0fcad8211195499bc566e6c70312b31af700. Reviewed-by: Aleix Roca Nonell <aleix.rocanonell@bsc.es>