issue #20888: We want this logic to apply to pre-existing records only.
Merge pull request #837 from jrogelstad/21496

issue #20888: We want this logic to apply to pre-existing records only.