diff --git a/assignment-impl/impl/src/java/org/sakaiproject/assignment/impl/BaseAssignmentService.java b/assignment-impl/impl/src/java/org/sakaiproject/assignment/impl/BaseAssignmentService.java
index 3de7f0e..959eb4d 100644
--- a/assignment-impl/impl/src/java/org/sakaiproject/assignment/impl/BaseAssignmentService.java
+++ b/assignment-impl/impl/src/java/org/sakaiproject/assignment/impl/BaseAssignmentService.java
@@ -4366,9 +4366,9 @@ public abstract class BaseAssignmentService implements AssignmentService, Entity
                                         for (Iterator gIterator = groupRefs.iterator(); gIterator.hasNext();)
                                         {
                                                 Group _gg = (Group)gIterator.next();
-                                                if (_gg.getProperties().get(GROUP_SECTION_PROPERTY) == null) {		// NO SECTIONS (this might not be valid test for manually created sections)
+                                                //if (_gg.getProperties().get(GROUP_SECTION_PROPERTY) == null) {		// NO SECTIONS (this might not be valid test for manually created sections)
                                                         rv.add(_gg);
-                                                }
+                                                //}
                                         }
 				} 
 				else
@@ -4377,7 +4377,7 @@ public abstract class BaseAssignmentService implements AssignmentService, Entity
 					for (Iterator gIterator = groupRefs.iterator(); gIterator.hasNext();)
 					{
 						Group _gg = st.getGroup((String)gIterator.next());		// NO SECTIONS (this might not be valid test for manually created sections)
-						if (_gg != null && _gg.getProperties().get(GROUP_SECTION_PROPERTY) == null) {
+						if (_gg != null) {// && _gg.getProperties().get(GROUP_SECTION_PROPERTY) == null) {
 							rv.add(_gg);
 						}
 					}
diff --git a/assignment-tool/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java b/assignment-tool/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
index 684fcf5..7705d37 100644
--- a/assignment-tool/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
+++ b/assignment-tool/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
@@ -1380,7 +1380,7 @@ public class AssignmentAction extends PagedResourceActionII
                 Iterator<Group> _groups = site.getGroupsWithMember(member).iterator();
                 while (_groups.hasNext()) {
                         Group _g = _groups.next();
-                        if (_g.getMember(member) != null && _g.getProperties().get(GROUP_SECTION_PROPERTY) == null)
+                        if (_g.getMember(member) != null)// && _g.getProperties().get(GROUP_SECTION_PROPERTY) == null)
                                  groups.add(_g);
                 }
             } else {
@@ -1388,7 +1388,7 @@ public class AssignmentAction extends PagedResourceActionII
                 while (_it.hasNext()) {
                         String _gRef = _it.next();
                         Group _g = site.getGroup(_gRef);
-                        if (_g != null && _g.getMember(member) != null && _g.getProperties().get(GROUP_SECTION_PROPERTY) == null)
+                        if (_g != null && _g.getMember(member) != null)// && _g.getProperties().get(GROUP_SECTION_PROPERTY) == null)
                                  groups.add(_g);
                 }
             }
@@ -2022,9 +2022,9 @@ public class AssignmentAction extends PagedResourceActionII
                             Iterator<Group> _it = groupsAllowAddAssignment.iterator();
                             while (_it.hasNext()) {
                                 Group _group = _it.next();
-                                if (_group.getProperties().get(GROUP_SECTION_PROPERTY) == null) {
+                                //if (_group.getProperties().get(GROUP_SECTION_PROPERTY) == null) {
                                     _valid_groups.add(_group);
-                                }
+                                //}
                             }
                             groupsAllowAddAssignment = _valid_groups;
                         }
@@ -10563,7 +10563,7 @@ public class AssignmentAction extends PagedResourceActionII
                                 	for (Iterator<Group> iSubmitterGroupsIterator = submitterGroups.iterator(); iSubmitterGroupsIterator.hasNext();)
                                 	{
                                             Group gId = iSubmitterGroupsIterator.next();
-                                            if (gId.getProperties().get(GROUP_SECTION_PROPERTY) == null) {
+                                            //if (gId.getProperties().get(GROUP_SECTION_PROPERTY) == null) {
                                                 try
                                                 {
                                                         	AssignmentSubmission sub = AssignmentService.getSubmission(aRef, gId.getId());
@@ -10577,7 +10577,7 @@ public class AssignmentAction extends PagedResourceActionII
                                                 {
                                                         	M_log.warn(this + ".sizeResources: cannot have permission to access submission of assignment " + aRef + " of group " + gId.getId());
                                                 }
-                                            }
+                                            //}
                                 	}
                         	}
 
@@ -11621,7 +11621,7 @@ public class AssignmentAction extends PagedResourceActionII
                         while (_checkGroups.hasNext()) {
                             Group _checkGroup = _checkGroups.next();
                             // exclude Sections from eligible groups
-                            if (_checkGroup.getProperties().get(GROUP_SECTION_PROPERTY) == null) {
+                            //if (_checkGroup.getProperties().get(GROUP_SECTION_PROPERTY) == null) {
                                 if (!specify_groups) {
                                     _count++;
 				    if (_count > 1) _sb.append(", ");
@@ -11641,7 +11641,7 @@ public class AssignmentAction extends PagedResourceActionII
 				    }
                                   }
                                 }
-                            }
+                            //}
                         }
                         if (_count > 1) {
                             try {