Index: wp-content/themes/twentytwelve/style.css
===================================================================
--- wp-content/themes/twentytwelve/style.css	(revision 21941)
+++ wp-content/themes/twentytwelve/style.css	(working copy)
@@ -1474,7 +1474,7 @@
 		width: 47.916666667%;
 	}
 	.template-front-page .widget-area .widget,
-	.template-front-page .widget-area.two .front-widgets {
+	.template-front-page.two-sidebars .widget-area .front-widgets {
 		float: left;
 		width: 51.875%;
 		margin-bottom: 24px;
@@ -1484,14 +1484,14 @@
 		clear: right;
 	}
 	.template-front-page .widget-area .widget:nth-child(even),
-	.template-front-page .widget-area.two .front-widgets + .front-widgets {
+	.template-front-page.two-sidebars .widget-area .front-widgets + .front-widgets {
 		float: right;
 		width: 39.0625%;
 		margin: 0 0 24px;
 		margin: 0 0 1.714285714rem;
 	}
-	.template-front-page .widget-area.two .widget,
-	.template-front-page .widget-area.two .widget:nth-child(even) {
+	.template-front-page.two-sidebars .widget,
+	.template-front-page.two-sidebars .widget:nth-child(even) {
 		float: none;
 		width: auto;
 	}
Index: wp-content/themes/twentytwelve/sidebar-front.php
===================================================================
--- wp-content/themes/twentytwelve/sidebar-front.php	(revision 21941)
+++ wp-content/themes/twentytwelve/sidebar-front.php	(working copy)
@@ -20,7 +20,7 @@
 
 // If we get this far, we have widgets. Let do this.
 ?>
-<div id="secondary" <?php twentytwelve_frontpage_sidebar_class(); ?> role="complementary">
+<div id="secondary" class="widget-area" role="complementary">
 	<?php if ( is_active_sidebar( 'sidebar-2' ) ) : ?>
 	<div class="first front-widgets">
 		<?php dynamic_sidebar( 'sidebar-2' ); ?>
Index: wp-content/themes/twentytwelve/rtl.css
===================================================================
--- wp-content/themes/twentytwelve/rtl.css	(revision 21941)
+++ wp-content/themes/twentytwelve/rtl.css	(working copy)
@@ -199,14 +199,14 @@
 		margin: 8px 0 8px 24px;
 	}
 	.template-front-page .widget-area .widget,
-	.template-front-page .widget-area.two .front-widgets {
+	.template-front-page.two-sidebars .widget-area .front-widgets {
 		float: right;
 	}
 	.template-front-page .widget-area .widget:nth-child(odd) {
 		clear: left;
 	}
 	.template-front-page .widget-area .widget:nth-child(even),
-	.template-front-page .widget-area.two .front-widgets + .front-widgets {
+	.template-front-page.two-sidebars .widget-area .front-widgets + .front-widgets {
 		float: left;
 		margin: 0 24px 0;
 		margin: 0 1.714285714rem 0;
Index: wp-content/themes/twentytwelve/functions.php
===================================================================
--- wp-content/themes/twentytwelve/functions.php	(revision 21941)
+++ wp-content/themes/twentytwelve/functions.php	(working copy)
@@ -216,20 +216,6 @@
 }
 add_action( 'widgets_init', 'twentytwelve_widgets_init' );
 
-/**
- * Counts the number of footer sidebars to enable dynamic classes for the footer.
- *
- * @since Twenty Twelve 1.0
- */
-function twentytwelve_frontpage_sidebar_class() {
-	$classes = array( 'widget-area' );
-
-	if ( is_active_sidebar( 'sidebar-2' ) && is_active_sidebar( 'sidebar-3' ) )
-		$classes[] = 'two';
-
-	echo 'class="' . implode( ' ', $classes ) . '"';
-}
-
 if ( ! function_exists( 'twentytwelve_content_nav' ) ) :
 /**
  * Displays navigation to next/previous pages when applicable.
@@ -366,6 +352,7 @@
  *    or full-width template.
  * 2. A thumbnail in the Front Page template.
  * 3. White or empty background color to change the layout and spacing.
+ * 4. Number of sidebars for front page template footer widget areas.
  *
  * @since Twenty Twelve 1.0
  *
@@ -378,6 +365,9 @@
 	if ( ! is_active_sidebar( 'sidebar-1' ) || is_page_template( 'page-templates/full-width.php' ) )
 		$classes[] = 'full-width';
 
+	if ( is_active_sidebar( 'sidebar-2' ) && is_active_sidebar( 'sidebar-3' ) )
+		$classes[] = 'two-sidebars';
+
 	if ( is_page_template( 'page-templates/front-page.php' ) ) {
 		$classes[] = 'template-front-page';
 		if ( has_post_thumbnail() )