Revert to previous state

While fixing a merge conflict I must have messed up badly

Signed-off-by: Paul de Wouters <paul@hmn.md>