=== modified file 'lib/lp/bugs/browser/bugalsoaffects.py'
--- a/lib/lp/bugs/browser/bugalsoaffects.py	2010-08-11 15:35:29 +0000
+++ b/lib/lp/bugs/browser/bugalsoaffects.py	2010-08-18 23:58:28 +0000
@@ -441,22 +441,6 @@
         Launchpad will record that.
         """)
 
-# XXX: GavinPanella 2008-02-13 bug=201793: This additional description
-# for EMAIL_UPSTREAM_DONE should be appended when EMAIL_UPSTREAM is
-# made available.
-#
-#   "Next time, try using Launchpad to send the message upstream
-#    too. That way it may be able to follow the conversation that
-#    results from your bug report. This is especially true for public
-#    mailing lists."
-
-    UNLINKED_UPSTREAM = Item(
-        """I just want to register that it is upstream right now; \
-           I don't have any way to link it.
-
-        Launchpad will record that.
-        """)
-
 
 class IAddBugTaskWithUpstreamLinkForm(IAddBugTaskForm):
     """Form for adding an upstream bugtask with linking options.
@@ -589,12 +573,7 @@
     def main_action(self, data):
         link_upstream_how = data.get('link_upstream_how')
 
-        if link_upstream_how == LinkUpstreamHowOptions.UNLINKED_UPSTREAM:
-            # Erase bug_url because we don't want to create a bug
-            # watch against a specific URL.
-            if 'bug_url' in data:
-                del data['bug_url']
-        elif link_upstream_how == LinkUpstreamHowOptions.EMAIL_UPSTREAM_DONE:
+        if link_upstream_how == LinkUpstreamHowOptions.EMAIL_UPSTREAM_DONE:
             # Ensure there's a bug tracker for this email address.
             bug_url = 'mailto:' + data['upstream_email_address_done']
             getUtility(IBugTrackerSet).ensureBugTracker(

=== modified file 'lib/lp/bugs/templates/bugtask-requestfix-upstream.pt'
--- a/lib/lp/bugs/templates/bugtask-requestfix-upstream.pt	2010-07-23 16:00:36 +0000
+++ b/lib/lp/bugs/templates/bugtask-requestfix-upstream.pt	2010-08-18 23:58:28 +0000
@@ -138,10 +138,6 @@
               </p>
             </td>
           </tr>
-          <tr>
-            <td colspan="2"
-                tal:content="structure link_items/UNLINKED_UPSTREAM" />
-          </tr>
         </table>
 
       </div>