You don't need this too in 1.10.x