Revert the latest commit - earlier commit was not an accidental check in of older files, but intentional changes made by Dave M and myself

This reverts commit c9209ff19d24e3151990d60e08b33aa0ca51c9e5.