Apply SIGINT restoration to new module layout