regression from commit 457aba54 ("fix some dodgy static vars
in connectivity").

Change-Id: I0ab2162d4fa1b09b537c149c4af0f64a2252b64e