Revert to using tags because that is documented and should work