A cross-platform fix should go upstream.