Quick fix to only validate billing address for now