Can we deprecate this in 4.x and remove it entirely here?