diff --git a/normalize.metrics.css b/normalize.metrics.css
index d0ac2c7..cbc466a 100644
--- a/normalize.metrics.css
+++ b/normalize.metrics.css
@@ -51,31 +51,34 @@ blockquote {
  * Heading content
 */
 
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-hgroup {
+h1 {
+	font-size: 2em;
+	margin: 0.67em 0;
+}
+
+h2 {
+	font-size: 1.5em;
+	margin: 0.83em 0;
+}
+
+h3 {
+	font-size: 1.17em;
 	margin: 1em 0;
 }
 
-p + h2,
-p + h3,
-p + h4,
-p + h5,
-p + h6 {
-	margin-top: 2em;
+h4 {
+	font-size: 1em;
+	margin: 1.33em 0;
 }
 
-hgroup h1,
-hgroup h2,
-hgroup h3,
-hgroup h4,
-hgroup h5,
-hgroup h6 {
-	margin: 0.5em 0;
+h5 {
+	font-size: 0.83em;
+	margin: 1.67em 0;
+}
+
+h6 {
+	font-size: 0.67em;
+	margin: 2.33em 0;
 }
 
 /*
@@ -127,38 +130,6 @@ hr {
 	margin: -1px 0 1em;
 }
 
-/* Fonts */
-
-h1 {
-	font-size: 2em;
-	margin: 0.67em 0;
-}
-
-h2 {
-	font-size: 1.5em;
-	margin: 0.83em 0;
-}
-
-h3 {
-	font-size: 1.17em;
-	margin: 1em 0;
-}
-
-h4 {
-	font-size: 1em;
-	margin: 1.33em 0;
-}
-
-h5 {
-	font-size: 0.83em;
-	margin: 1.67em 0;
-}
-
-h6 {
-	font-size: 0.67em;
-	margin: 2.33em 0;
-}
-
 /*
  * Forms
 */