Is this TODO still applicable?