Revert "Merge branch 'surname-fix' into 'pregmod-master'"

This reverts merge request !7549 (merged)

@lowercasedonkey

I need to step out for awhile, so going to revert this to prevent the undefineds from running amok while I'm gone.