Revert "further nommu code exclusion cleanup"