Comment to add_origin, removed previous todo mark.