ResolveMacroRequest
This reverts an earlier revert (547d85e643) and fixes the Windows build.
547d85e643