Revert "Sales - Change" - Roll back two changes at the same time

This reverts commit f8fb5df7a81c0424649906c1781f08c4ddcbcc03.
Revert "Sales - Change" Roll back two changes

This reverts commit 1d0f435e721497c93b385217ca88cef70a364c0e.