Revert Stk

Change-Id: I79dce8933523a1b7e1ab5fb3bac0ab5b8ca75807