Merge pull request #90463 from DougGregor/pal-leave-macros-defined