a3a15957f4
## Context A new ADDRESS field type has been introduced and the company object has been updated to use this new type however this introduced a few regressions. The good strategy would be to introduce a new field and rename the old one. This PR revert that change to fix the issue.