Fix a bug where we were passing in address information that should remain unmodified...