Revert "Add __address__ to keep instance name reasonable"

This reverts commit 44c42771

This is being reverted at the request of @pcarranza and @bjk-gitlab.