Not sure if this fully resolves the issue, but it fixes local tests. PR: ports/55074 Submitted by: Lars Eggert <larse@isi.edu>