SI-7487 Revert "Removed -Ymacro-no-expand."

This reverts commit 71fb0b83a, which itself reverted the fix for SI-6812.