Prevent having two sets of origin options for non-saves (#18076)

Prevent having two sets of origin options for non-saves (#18076) #34594