Support tags
Revert spec to previous state