Changes for #82873: Module debugging broken (Christian)