diff --git a/__tests__/fixtures/tailwind-input.css b/__tests__/fixtures/tailwind-input.css
index 53204f9fd..ac3999689 100644
--- a/__tests__/fixtures/tailwind-input.css
+++ b/__tests__/fixtures/tailwind-input.css
@@ -1,7 +1,5 @@
 @tailwind preflight;
 
-@tailwind components;
-
 @tailwind utilities;
 
 @responsive {
diff --git a/src/lib/substituteTailwindAtRules.js b/src/lib/substituteTailwindAtRules.js
index 374017d95..8fba3d8df 100644
--- a/src/lib/substituteTailwindAtRules.js
+++ b/src/lib/substituteTailwindAtRules.js
@@ -21,20 +21,12 @@ export default function(config) {
       }
 
       if (atRule.params === 'components') {
-        const tailwindComponentTree = postcss.root({
-          nodes: container(unwrappedConfig),
-        })
-
         const pluginComponentTree = postcss.root({
           nodes: pluginComponents,
         })
 
-        prefixTree(tailwindComponentTree, unwrappedConfig.options.prefix)
-
-        tailwindComponentTree.walk(node => (node.source = atRule.source))
         pluginComponentTree.walk(node => (node.source = atRule.source))
 
-        atRule.before(tailwindComponentTree)
         atRule.before(pluginComponentTree)
         atRule.remove()
       }
@@ -47,7 +39,7 @@ export default function(config) {
         }
 
         const tailwindUtilityTree = postcss.root({
-          nodes: utilities.nodes,
+          nodes: [...container(unwrappedConfig), ...utilities.nodes],
         })
 
         const pluginUtilityTree = postcss.root({