Fixing a failed merge

The merge that was done to update the master branch created issues.  This pull request reverts the changes made by the merge to establish the correct source.

This reverts commit 9920efd42c333890ec2acc51de728ad612c6fd8e, reversing
changes made to 952735c288080c00c313b12f1953c0893bec1169.