Revert "Revert to upstream to see if #1932616 is still a problem."

This reverts commit eeba350c2f7c1f1f823c5744d298be4015e22366.
Revert "fix the serial identifier for ip addresses, see #1930670"

This reverts commit 93123c94858e77c43e0814216361f5778702b29a.