Originator is actually not optional how we use it (#573)

Originator is actually not optional how we use it (#573) #514