diff --git a/lib/next-amp-demo/pages/components/AmpMustache.tsx b/lib/next-amp-demo/pages/components/AmpMustache.tsx
index 28b4b0638..aeef65ee4 100644
--- a/lib/next-amp-demo/pages/components/AmpMustache.tsx
+++ b/lib/next-amp-demo/pages/components/AmpMustache.tsx
@@ -21,30 +21,27 @@ import {AmpMustache, AmpList, AmpIncludeCustomElement} from '@ampproject/toolbox
 export const config = {amp: true};
 
 const initialItems = {
-  context: {
-    items: [
-      {
-        name: 'amp.dev',
-        url: 'https://amp.dev',
-      },
-      {
-        name: 'Next.js',
-        url: 'https://nextjs.org',
-      },
-    ],
-  },
+  items: [
+    {
+      name: 'amp.dev',
+      url: 'https://amp.dev',
+    },
+    {
+      name: 'Next.js',
+      url: 'https://nextjs.org',
+    },
+  ],
 };
 
 const AmpMustacheSample: NextPage<{}> = () => {
-  const {clientSideTemplate, serverSideTemplate} = AmpMustache.universal(
+  const template = (
     <AmpMustache>
       {`{{#items}}`}
       <div>
         <a href='{{url}}'>{`{{name}}`}</a>
       </div>
       {`{{/items}}`}
-    </AmpMustache>,
-    initialItems
+    </AmpMustache>
   );
 
   return (
@@ -58,9 +55,11 @@ const AmpMustacheSample: NextPage<{}> = () => {
         items='.'
         data-amp-bind-src='context'
       >
-        {clientSideTemplate}
+        {template}
       </AmpList>
-      <div data-amp-bind-hidden='context != undefined'>{serverSideTemplate}</div>
+      <div data-amp-bind-hidden='context != undefined'>
+        {AmpMustache.render(template, initialItems)}
+      </div>
       <button
         on="tap:AMP.setState({
           context: {
diff --git a/lib/next-amp/README.md b/lib/next-amp/README.md
index 2eec7af0b..870e28dc1 100644
--- a/lib/next-amp/README.md
+++ b/lib/next-amp/README.md
@@ -125,22 +125,46 @@ The `AmpMustache` component simplifies AMP’s template syntax from `<template t
 </AmpMustache>
 ```
 
-**Alternative approach:** wrap mustache directives in components. This has the positive side-effect of making it possible to render the same template server-side and client-side:
-
-```
-<AmpMustache>
-  <h1>Seats</h1>
-  <Loop id="seats">
-    <p><Token id="name"/>
-    <If id="disabled">
-      Disabled Seat
-    </If>
-    <IfNot id="disabled">
-      Normal Seat
-    </IfNot>
-    </p>
-  </Loop>
-</AmpMustache>
+Nice: AmpMustache templates can be rendered client-side _and server-side_. For example, for generating `amp-list` placeholders:
+
+```
+const template = (
+  <AmpMustache>
+    {`{{#items}}`}
+    <div>
+      <a href='{{url}}'>{`{{name}}`}</a>
+    </div>
+    {`{{/items}}`}
+  </AmpMustache>
+);
+
+return (
+  <AmpList
+    layout='fixed-height'
+    data-amp-bind-is-layout-container='context'
+    height='0'
+    single-item=''
+    items='.'
+    data-amp-bind-src='context'
+  >
+    {template}
+    <div placeholder>
+      {AmpMustache.render(template, {
+        items: [
+          {
+            name: 'amp.dev',
+            url: 'https://amp.dev',
+          },
+          {
+            name: 'Next.js',
+            url: 'https://nextjs.org',
+          },
+        ]
+      }
+    )}
+    </div>
+  </AmpList>
+)
 ```
 
 ### amp-access
diff --git a/lib/next-amp/src/components/AmpMustache.tsx b/lib/next-amp/src/components/AmpMustache.tsx
index fd38930a3..f40d6e8a0 100644
--- a/lib/next-amp/src/components/AmpMustache.tsx
+++ b/lib/next-amp/src/components/AmpMustache.tsx
@@ -28,24 +28,11 @@ class AmpMustache extends React.Component<
     context?: any;
   }
 > {
-  static universal(element: JSX.Element, context: any) {
-    return {
-      clientSideTemplate: element,
-      serverSideTemplate: React.cloneElement(element, context),
-    };
+  static render(element: JSX.Element, context: any) {
+    return React.cloneElement(element, {
+      context,
+    });
   }
-  static Section: React.FunctionComponent<SectionProps> = ({children, id, inverted}) => (
-    <>
-      {`{{${inverted ? '^' : '#'}${id}}}`}
-      {children}
-      {`{{/${id}}}`}
-    </>
-  );
-  static Variable: React.FunctionComponent<VariableProps> = ({id, unescape}) => (
-    <>{`{{${unescape ? '{' : ''}${id}${unescape ? '}' : ''}}}`}</>
-  );
-
-  static Comment: React.FunctionComponent<CommentProps> = ({text}) => <>{`{{!${text}}`}</>;
 
   render() {
     const {children, context, ...rest} = this.props;
@@ -84,16 +71,4 @@ function renderToString(element: JSX.Element) {
   return ReactDOMServer.renderToStaticMarkup(element);
 }
 
-type SectionProps = {
-  id: string;
-  inverted?: boolean;
-};
-type VariableProps = {
-  id: string;
-  unescape?: boolean;
-};
-type CommentProps = {
-  text: string;
-};
-
 export default AmpMustache;