Index: src/orca/Gecko.py
===================================================================
--- src/orca/Gecko.py	(revision 2358)
+++ src/orca/Gecko.py	(working copy)
@@ -5279,42 +5279,6 @@
                         obj = obj.child(0)
 
             [obj, characterOffset] = self.findFirstCaretContext(obj, 0)
-            if obj and obj.role in [rolenames.ROLE_CHECK_BOX,
-                                    rolenames.ROLE_RADIO_BUTTON]:
-                # [[[TODO: HACK - JD.  Explicit focus-grabbing doesn't
-                # work on all objects.  But form fields by their very
-                # nature have text around them.  Therefore, let's try 
-                # quietly updating our caretContext to the text that's
-                # just before the form field we care about before setting
-                # the caret position to that form field.]]]
-                #
-                [prevObject, prevOffset] = \
-                            self.findPreviousCaretInOrder(obj, -1, False)
-                if prevObject:
-                    self.setCaretPosition(prevObject, prevOffset)
-
-            elif obj and obj.role in [rolenames.ROLE_ENTRY,
-                                      rolenames.ROLE_PASSWORD_TEXT]:
-                # [[[TODO: HACK - JD.  If it's an entry, try to activate it
-                # through the AccessibleAction interface.  NOTE: This seems
-                # to work fine for single-line entries and fail for multi-
-                # line ones. ]]]
-                #
-                name = None
-                if obj.action:
-                    for i in range(0, obj.action.nActions):
-                        name = obj.action.getName(i)
-                        if name == "activate":
-                            break
-                    if name:
-                        success = obj.action.doAction(i)
-                        if success:
-                            # Activating this entry will trigger a focus:
-                            # event for us which will cause everything to
-                            # be spoken, updated, etc.
-                            #
-                            return
-
             self.setCaretPosition(obj, characterOffset)
             self.updateBraille(obj)
             if speakContents:
@@ -5357,42 +5321,6 @@
                         obj = obj.child(0)
 
             [obj, characterOffset] = self.findFirstCaretContext(obj, 0)
-            if obj and obj.role in [rolenames.ROLE_CHECK_BOX,
-                                    rolenames.ROLE_RADIO_BUTTON]:
-                # [[[TODO: HACK - JD.  Explicit focus-grabbing doesn't
-                # work on all objects.  But form fields by their very
-                # nature have text around them.  Therefore, let's try 
-                # quietly updating our caretContext to the text that's
-                # just after the form field we care about before setting
-                # the caret position to that form field.]]]
-                #
-                [nextObject, nextOffset] = \
-                                     self.findNextCaretInOrder(obj, -1, False)
-                if nextObject:
-                    self.setCaretPosition(nextObject, nextOffset)
-
-            elif obj and obj.role in [rolenames.ROLE_ENTRY,
-                                      rolenames.ROLE_PASSWORD_TEXT]:
-                # [[[TODO: HACK - JD.  If it's an entry, try to activate it
-                # through the AccessibleAction interface.  NOTE: This seems
-                # to work fine for single-line entries and fail for multi-
-                # line ones. ]]]
-                #
-                name = None
-                if obj.action:
-                    for i in range(0, obj.action.nActions):
-                        name = obj.action.getName(i)
-                        if name == "activate":
-                            break
-                    if name:
-                        success = obj.action.doAction(i)
-                        if success:
-                            # Activating this entry will trigger a focus:
-                            # event for us which will cause everything to
-                            # be spoken, updated, etc.
-                            #
-                            return
-
             self.setCaretPosition(obj, characterOffset)
             self.updateBraille(obj)
             if speakContents:
