Revert "Packages: Fix for SAP turn ON/OFF fails issue."

This reverts commit 496cf1d493595b5530809ad10c44b2380c71dd0e.