Reverted tags change due to test fail