This reminds me - maybe we should just remove the deprecated functions. 3.1.0 has quite a few breaking changes, seems silly to have these few functions still in there for backwards compatibility. What do you think?