diff --git a/layouts/shortcodes/tab.html b/layouts/shortcodes/tab.html
index 15456d5..df42428 100644
--- a/layouts/shortcodes/tab.html
+++ b/layouts/shortcodes/tab.html
@@ -1,12 +1,9 @@
-{{ if .Parent }}
-  {{ $name := .Get 0 }}
-  {{ $group := printf "tabs-%d" .Parent.Ordinal }}
-
-  {{ if not (.Parent.Scratch.Get $group) }}
-    {{ .Parent.Scratch.Set $group slice }}
-  {{ end }}
-
-  {{ .Parent.Scratch.Add $group (dict "Name" $name "Content" .Inner) }}
-{{ else }}
-  {{ errorf "%q: 'tab' shortcode must be inside 'tabs' shortcode" .Page.Path }}
-{{ end}}
+{{- $group := printf "tabs-%d" .Parent.Ordinal -}}
+{{- $tab := printf "%s-%d" $group .Ordinal }}
+<input type="radio" class="toggle" name="{{ $group }}" id="{{ $tab }}" {{ if not .Ordinal }}checked="checked"{{ end }} />
+<label for="{{ $tab }}">
+  {{- .Get 0 -}}
+</label>
+<div class="book-tabs-content markdown-inner">
+  {{- .Inner -}}
+</div>
diff --git a/layouts/shortcodes/tabs.html b/layouts/shortcodes/tabs.html
index 8f2dd33..fecbbeb 100644
--- a/layouts/shortcodes/tabs.html
+++ b/layouts/shortcodes/tabs.html
@@ -1,14 +1,3 @@
-{{- if .Inner }}{{ end -}}
-{{- $group := printf "tabs-%d" .Ordinal -}}
-
 <div class="book-tabs">
-{{- range $index, $tab := .Scratch.Get $group -}}
-  <input type="radio" class="toggle" name="{{ $group }}" id="{{ printf "%s-%d" $group $index }}" {{ if not $index }}checked="checked"{{ end }} />
-  <label for="{{ printf "%s-%d" $group $index }}">
-    {{- $tab.Name -}}
-  </label>
-  <div class="book-tabs-content markdown-inner">
-    {{- .Content | safeHTML -}}
-  </div>
-{{- end -}}
+{{ .Inner }}
 </div>