Revert "Fix a merge anomaly"
this was an 'oops'

This reverts commit 6200810e703fd7964263491f05a8d429b30b2a79.