Merge "Remove no-longer-used macro." into main