Update 4-21 build to not use address book