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