Revert "Merge pull request #2 from ClearwaterCore/sfr469194"

This reverts commit 9f8b73ff50cce3e1a854cc8e7a1349ad1da702b6, reversing
changes made to dc499f1497e773fcf1259fa2600179b1c74b9ce5.