As of commit 337367a733e107df1ecb89955f0a249491bc62d9, the problem seems to
have gone away.