From cd1837388a26cabee20b62af5cd2d5f51843c0ec Mon Sep 17 00:00:00 2001
From: Eric Haberkorn <erichaberkorn@gmail.com>
Date: Wed, 26 Apr 2023 11:02:20 -0400
Subject: [PATCH] fix backward compat issue caused by localities being set to
 `null` when they are unset (#17144)