Merge "Revert "Scan immune spaces using mod union tables.""