Index: branches/1.0.x/checkout.tpl
===================================================================
diff -u -N -r14830 -r15028
--- branches/1.0.x/checkout.tpl	(.../checkout.tpl)	(revision 14830)
+++ branches/1.0.x/checkout.tpl	(.../checkout.tpl)	(revision 15028)
@@ -51,9 +51,7 @@
 					<inp2:m_RenderElement name="inp_edit_address" prefix="ord" field="BillingAddress1" field2="BillingAddress2" title="lu_fld_Address"/>
 					<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingCity" title="lu_fld_City"/>
 					<inp2:m_RenderElement name="inp_edit_country" prefix="ord" field="BillingCountry" state_field="BillingState" title="lu_fld_Country" has_empty="1" empty_label="lu_opt_SelectCountry"/>
-
-					<!-- TODO: preload states by country -->
-					<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="BillingState" title="lu_fld_State" has_empty="1" row_class="alt1"/>
+					<inp2:m_RenderElement name="inp_edit_state" prefix="ord" field="BillingState" title="lu_fld_State" has_empty="1" row_class="alt1"/>
 					<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingZip" title="lu_fld_Zip" row_class="alt2"/>
 					<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingPhone" title="lu_fld_Phone"/>
 				</fieldset>
@@ -138,9 +136,7 @@
 						<inp2:m_RenderElement name="inp_edit_address" prefix="ord" field="ShippingAddress1" field2="ShippingAddress2" title="lu_fld_Address"/>
 						<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCity" title="lu_fld_City"/>
 						<inp2:m_RenderElement name="inp_edit_country" prefix="ord" field="ShippingCountry" state_field="ShippingState" title="lu_fld_Country" has_empty="1" empty_label="lu_opt_SelectCountry"/>
-
-						<!-- TODO: preload states by country -->
-						<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="ShippingState" title="lu_fld_State" has_empty="1" row_class="alt1"/>
+						<inp2:m_RenderElement name="inp_edit_state" prefix="ord" field="ShippingState" title="lu_fld_State" has_empty="1" row_class="alt1"/>
 						<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingZip" title="lu_fld_Zip" row_class="alt2"/>
 					</div>