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

This reverts commit 8d6101a8fd2a0dea912012b5b33ed37ce480e266, reversing
changes made to f520d7f9bb48685d64c21443731998bba116f9b1.