I had some issue with the merge and these files did
not port properly.  Manually fixed.