Even if this isn't very clean and I agree it should be removed we can't just remove this without deprecating it first.