Moved a TODO to a ticket.