Addressbook changes per Greg Moser

This TODO should be removed.