Fix for #3331

Fix for #3331
> The deprecation version should be 2.6, in 3.0 it's gone :)

I agree.