Use MapIt master again; we can now migrate away from 7-area-unions