fix incorrect merge conflict resolution

I picked the wrong direction in 7f33fed4 and reintroduced removed
code.