Revert "WATERSMART-378"

This reverts commit 1ac755b4eb4cb9e1bcd48930c2bcfdda3e334915.