Cs 252 2

Gave into Jeremy's will and made the change so that 4.0.0 behaves like 3.17.