It's been long enough -- make the behavior introduced in 1.6 the default.