Updated the populate for addresses during checkout.  This is actually a
better fix than commit 00f5be7aaf0eec753a553c080e3042b92835c6a9