Simplify Thomas patch: take 3

Remove constrain on (ss-2)

bench: 4072006