Should we remove this in 3.1?