Reverts tag reporting changes

Change-Id: I5211c92e4704a868e712052c70582655aa13755a