This failure was happening long before I started on this PR. I can take that skip test out, but resolving it is way out of scope for this PR.