Backed out changes in r6088 of addressbook_popup.c