Revert "remove tag reference wrapper"

This reverts commit bf8c56d4f4bba3ac3cd8bbb633464972e61e871a.