Default to use billing address. [Fixes #1609] for 1-1-stable