[please note cross-posting and amend follow-ups as appropriate]
Is it now safe to SUBSTitute templates which have a <noinclude> section?
If so, we can go back and re-insert those <noinclude> sections which were removed because they screwed up the target articles.