Yep, have removed this and un-deprecated the other.