fix incorrect merge conflict resolution
fix incorrect merge conflict resolution

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

Kitware/cinema,Kitware/cinema,Kitware/cinema,Kitware/cinema