Revert Tagged not to be a value class