Remove orphaned address.
Merged from release/1.6