Simplify Thomas patch: take 2

Remove constrain on (ss-2)

bench: 3813362