diff --git a/src/defaultPlugins.js b/src/defaultPlugins.js
index 7f8141267..e18473554 100644
--- a/src/defaultPlugins.js
+++ b/src/defaultPlugins.js
@@ -1,3 +1,4 @@
+import float from './plugins/float'
 import fonts from './plugins/fonts'
 import fontWeights from './plugins/fontWeights'
 import height from './plugins/height'
@@ -35,6 +36,7 @@ import zIndex from './plugins/zIndex'
 
 export default function (config) {
   return [
+    config.modules.float === false ? () => {} : float(),
     config.modules.fonts === false ? () => {} : fonts(),
     config.modules.fontWeights === false ? () => {} : fontWeights(),
     config.modules.height === false ? () => {} : height(),
diff --git a/src/generators/float.js b/src/generators/float.js
deleted file mode 100644
index e7707e783..000000000
--- a/src/generators/float.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import _ from 'lodash'
-import postcss from 'postcss'
-import defineClasses from '../util/defineClasses'
-
-export default function() {
-  return _.concat(
-    defineClasses({
-      'float-right': { float: 'right' },
-      'float-left': { float: 'left' },
-      'float-none': { float: 'none' },
-    }),
-    postcss.parse(`
-      .clearfix:after {
-        content: "";
-        display: table;
-        clear: both;
-      }
-    `).nodes
-  )
-}
diff --git a/src/plugins/float.js b/src/plugins/float.js
new file mode 100644
index 000000000..7a7eece99
--- /dev/null
+++ b/src/plugins/float.js
@@ -0,0 +1,14 @@
+export default function () {
+  return function ({ addUtilities, config }) {
+    addUtilities({
+      '.float-right': { float: 'right' },
+      '.float-left': { float: 'left' },
+      '.float-none': { float: 'none' },
+      '.clearfix:after': {
+        content: '""',
+        display: 'table',
+        clear: 'both',
+      }
+    }, config('modules.float'))
+  }
+}
diff --git a/src/utilityModules.js b/src/utilityModules.js
index 78bbb3166..36ae068c0 100644
--- a/src/utilityModules.js
+++ b/src/utilityModules.js
@@ -13,7 +13,6 @@ import borderWidths from './generators/borderWidths'
 import cursor from './generators/cursor'
 import display from './generators/display'
 import flexbox from './generators/flexbox'
-import float from './generators/float'
 
 export default [
   { name: 'lists', generator: lists },
@@ -31,5 +30,4 @@ export default [
   { name: 'cursor', generator: cursor },
   { name: 'display', generator: display },
   { name: 'flexbox', generator: flexbox },
-  { name: 'float', generator: float },
 ]