Undo merging

@lennartcl see #1419