Since #491] is accepted now, --disable-threads builds will be discontinued anyway. Therefore we don't have to fix this any more.