Partial revert f1593e3 : add Origin assignment method