Is this a todo because of backwards compatibility?