We should either mark it as deprecated or remove it then.