Revert "Corrected customer issues"

This reverts commit 5649a2548e4ee8997d913e8d15a65af1bfeac13b.