This was not supposed to be in 3.0.x branch