Revert "Updated Address Book implementation"

This reverts commit 00d351621d8585dd3b3d91585a713ff469b119b5.