Reverted to original default - not using SS mechanism