Revert "0010834: defining a key-value costumfield breaks addressbook"