I'm not sure this can be removed without a proper deprecation. In any case, it needs a ticket.