Please do not remove this definition in 2.4.x