to apply a different fix, since the current one does not apply to Darwin. This reverts commit bfaf7ae5.