I think we can get rid of this in 3.x