Correction to logging of previous merge.

It was recorded as a file add since the original was removed from
master. Removed in next commit, This contains the equivalent changes
to the new file