Revert revisions 57472, 57474, and 57477 which disabled some tests
when the email package was removed.  Email was restored, so restore the tests.
diff --git a/Lib/test/test_pyclbr.py b/Lib/test/test_pyclbr.py
index fe0141c..caccf11 100644
--- a/Lib/test/test_pyclbr.py
+++ b/Lib/test/test_pyclbr.py
@@ -175,7 +175,7 @@
         cm('pydoc')
 
         # Tests for modules inside packages
-        #cm('email.parser')
+        cm('email.parser')
         cm('test.test_pyclbr')
 
 
diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py
index db2b34b..ee8150e 100644
--- a/Lib/test/test_zipfile.py
+++ b/Lib/test/test_zipfile.py
@@ -439,7 +439,6 @@
         zipfp.close()
 
     def testWritePythonPackage(self):
-        return  # XXX(nnorwitz): disable test until email is checked in again.
         import email
         packagedir = os.path.dirname(email.__file__)