diff --git a/form/CheckBox.js b/form/CheckBox.js
index 0fc69a67c..bca2163d4 100644
--- a/form/CheckBox.js
+++ b/form/CheckBox.js
@@ -4,26 +4,18 @@ define([
 	"dojo/dom-attr", // domAttr.set
 	"dojo/has",		// has("dijit-legacy-requires")
 	"dojo/query", // query
-	"dojo/ready",
 	"./ToggleButton",
 	"./_CheckBoxMixin",
+	"../_FocusMixin",
 	"dojo/text!./templates/CheckBox.html",
 	"dojo/NodeList-dom", // NodeList.addClass/removeClass
 	"../a11yclick"	// template uses ondijitclick
-], function(require, declare, domAttr, has, query, ready, ToggleButton, _CheckBoxMixin, template){
+], function(require, declare, domAttr, has, query, ToggleButton, _CheckBoxMixin, _FocusMixin, template){
 
 	// module:
 	//		dijit/form/CheckBox
 
-	// Back compat w/1.6, remove for 2.0
-	if(has("dijit-legacy-requires")){
-		ready(0, function(){
-			var requires = ["dijit/form/RadioButton"];
-			require(requires);	// use indirection so modules not rolled into a build
-		});
-	}
-
-	return declare("dijit.form.CheckBox", [ToggleButton, _CheckBoxMixin], {
+	return declare("dijit.form.CheckBox", [ToggleButton, _CheckBoxMixin, _FocusMixin], {
 		// summary:
 		//		Same as an HTML checkbox, but with fancy styling.
 		//
diff --git a/form/templates/CheckBox.html b/form/templates/CheckBox.html
index 5122fe2aa..cb3d103db 100644
--- a/form/templates/CheckBox.html
+++ b/form/templates/CheckBox.html
@@ -1,6 +1,6 @@
 <div class="dijit dijitReset dijitInline" role="presentation"
 	><input
-	 	${!nameAttrSetting} type="${type}" role="${type}" aria-checked="false" ${checkedAttrSetting}
+	 	type="${type}" role="${type}" aria-checked="false" ${checkedAttrSetting}
 		class="dijitReset dijitCheckBoxInput"
 		data-dojo-attach-point="focusNode"
 	 	data-dojo-attach-event="ondijitclick:_onClick"