--- a/client.py
+++ b/client.py
@@ -1,18 +1,17 @@
 #!/usr/bin/python
 
 EXTENSION_CO_TAG = 'HEAD'
 LDAPCSDK_CO_TAG = 'LDAPCSDK_6_0_6_RTM'
 
 CHATZILLA_CO_TAG = 'HEAD'
 VENKMAN_CO_TAG = 'HEAD'
 
-EXTENSION_DIRS = ('extensions/typeaheadfind',
-                  'extensions/wallet',)
+EXTENSION_DIRS = ('extensions/wallet',)
 LDAPCSDK_DIRS = ('directory/c-sdk',)
 
 CHATZILLA_DIRS = ('extensions/irc',)
 VENKMAN_DIRS = ('extensions/venkman',)
 
 DEFAULT_COMM_REV = "tip"
 # URL of the default hg repository to clone for Mozilla.
 DEFAULT_MOZILLA_REPO = 'http://hg.mozilla.org/mozilla-central/'

--- a/suite/installer/removed-files.in
+++ b/suite/installer/removed-files.in
@@ -74,16 +74,18 @@ components/nsScriptableIO.js
 components/nsSetDefaultBrowser.js
 components/nsSetDefaultMail.js
 components/nsUnsetDefaultMail.js
 components/nsXmlRpcClient.js
 components/progressDlg.xpt
 components/search.xpt
 components/sidebar.xpt
 components/@DLL_PREFIX@srchsvc@DLL_SUFFIX@
+components/suitetypeaheadfind.xpt
+components/@DLL_PREFIX@suitetypeaheadfind@DLL_SUFFIX@
 components/urlwidgt.xpt
 components/util.xpt
 components/venkman-service.js
 components/@DLL_PREFIX@xmlextras@DLL_SUFFIX@
 components/winhooks.xpt
 components/xml-rpc.xpt
 @DLL_PREFIX@xpistub@DLL_SUFFIX@
 res/cmessage.txt

--- a/suite/installer/unix/packages
+++ b/suite/installer/unix/packages
@@ -194,19 +194,17 @@ bin/components/shellservice.xpt
 bin/components/signonviewer.xpt
 bin/components/spellchecker.xpt
 bin/components/storage.xpt
 bin/components/libstoragecomps.so
 bin/components/libsuite.so
 bin/components/suitebrowser.xpt
 bin/components/suitecommon.xpt
 bin/components/suitemigration.xpt
-bin/components/suitetypeaheadfind.xpt
 bin/components/libsystem-pref.so
-bin/components/libsuitetypeaheadfind.so
 bin/components/libtkautocomplete.so
 bin/components/libtoolkitcomps.so
 bin/components/toolkitprofile.xpt
 bin/components/toolkitremote.xpt
 bin/components/libtxmgr.so
 bin/components/txmgr.xpt
 bin/components/txtsvc.xpt
 bin/components/libuconv.so

--- a/suite/installer/windows/packages
+++ b/suite/installer/windows/packages
@@ -242,18 +242,16 @@ bin\components\xppref32.dll
 bin\components\xulapp.xpt
 bin\components\xuldoc.xpt
 bin\components\xultmpl.xpt
 bin\components\zipwriter.xpt
 bin\components\zipwriter.dll
 bin\plugins\npnul32.dll
 bin\components\helperAppDlg.xpt
 bin\AccessibleMarshal.dll
-bin\components\suitetypeaheadfind.xpt
-bin\components\suitetypeaheadfind.dll
 bin\sqlite3.dll
 
 ; JavaScript components
 bin\components\FeedProcessor.js
 bin\components\jsconsole-clhandler.js
 bin\components\nsAddonRepository.js
 bin\components\nsAxSecurityPolicy.js
 bin\components\nsBadCertHandler.js