Reverted tags impl back to original

Change-Id: I725c6e26b22e1e6f6942820f9b4f10fbbfdddd39