Revert followup change for #337585 -- the only thing an empty macro should return is the autogenerated id.
