0e91c38450
This reverts commit d0b04813ab.
I am reverting this because this was a breaking change and needs more
work and testing.
Signed-off-by: Martina Iglesias Fernandez <martina@roadie.io>