diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java
index 481fa468712fc9e6fbe919c87727145a76750118..2c5f92de396b73255b4bae4ac9afea1d4f78bd36 100644
--- a/core/src/main/java/hudson/ClassicPluginStrategy.java
+++ b/core/src/main/java/hudson/ClassicPluginStrategy.java
@@ -29,7 +29,6 @@ import hudson.PluginWrapper.Dependency;
 import hudson.model.Hudson;
 import hudson.util.CyclicGraphDetector;
 import hudson.util.CyclicGraphDetector.CycleDetectedException;
-import hudson.util.IOException2;
 import hudson.util.IOUtils;
 import hudson.util.MaskingClassLoader;
 import hudson.util.VersionNumber;
@@ -117,7 +116,7 @@ public class ClassicPluginStrategy implements PluginStrategy {
             try {
                 manifest = new Manifest(in);
             } catch (IOException e) {
-                throw new IOException2("Failed to load " + archive, e);
+                throw new IOException("Failed to load " + archive, e);
             } finally {
                 in.close();
             }
@@ -350,13 +349,13 @@ public class ClassicPluginStrategy implements PluginStrategy {
                     }
                     wrapper.setPlugin((Plugin) o);
                 } catch (LinkageError e) {
-                    throw new IOException2("Unable to load " + className + " from " + wrapper.getShortName(),e);
+                    throw new IOException("Unable to load " + className + " from " + wrapper.getShortName(),e);
                 } catch (ClassNotFoundException e) {
-                    throw new IOException2("Unable to load " + className + " from " + wrapper.getShortName(),e);
+                    throw new IOException("Unable to load " + className + " from " + wrapper.getShortName(),e);
                 } catch (IllegalAccessException e) {
-                    throw new IOException2("Unable to create instance of " + className + " from " + wrapper.getShortName(),e);
+                    throw new IOException("Unable to create instance of " + className + " from " + wrapper.getShortName(),e);
                 } catch (InstantiationException e) {
-                    throw new IOException2("Unable to create instance of " + className + " from " + wrapper.getShortName(),e);
+                    throw new IOException("Unable to create instance of " + className + " from " + wrapper.getShortName(),e);
                 }
             }
 
@@ -367,7 +366,7 @@ public class ClassicPluginStrategy implements PluginStrategy {
                 startPlugin(wrapper);
             } catch(Throwable t) {
                 // gracefully handle any error in plugin.
-                throw new IOException2("Failed to initialize",t);
+                throw new IOException("Failed to initialize",t);
             }
         } finally {
             Thread.currentThread().setContextClassLoader(old);
@@ -427,7 +426,7 @@ public class ClassicPluginStrategy implements PluginStrategy {
             unzipExceptClasses(archive, destDir, prj);
             createClassJarFromWebInfClasses(archive, destDir, prj);
         } catch (BuildException x) {
-            throw new IOException2("Failed to expand " + archive,x);
+            throw new IOException("Failed to expand " + archive,x);
         }
 
         try {
diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java
index b2564edc70afb7de07ef5e418dd62ce1ee16e256..df548f5583364df32be1242190c16b8cef9e5bf7 100644
--- a/core/src/main/java/hudson/FilePath.java
+++ b/core/src/main/java/hudson/FilePath.java
@@ -43,7 +43,6 @@ import hudson.remoting.RemoteInputStream;
 import hudson.remoting.Which;
 import hudson.security.AccessControlled;
 import hudson.util.DirScanner;
-import hudson.util.IOException2;
 import hudson.util.HeadBufferingStream;
 import hudson.util.FormValidation;
 import hudson.util.IOUtils;
@@ -95,14 +94,12 @@ import java.util.concurrent.TimeoutException;
 import com.jcraft.jzlib.GZIPInputStream;
 import com.jcraft.jzlib.GZIPOutputStream;
 
-import com.sun.jna.Native;
 import hudson.os.PosixException;
 import hudson.util.FileVisitor;
 import java.util.Enumeration;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Logger;
-import org.apache.tools.ant.taskdefs.Chmod;
 
 import org.apache.tools.zip.ZipFile;
 import org.apache.tools.zip.ZipEntry;
@@ -636,7 +633,7 @@ public final class FilePath implements Serializable {
                 } catch (IOException e) {
                     // various people reported "java.io.IOException: Not in GZIP format" here, so diagnose this problem better
                     in.fillSide();
-                    throw new IOException2(e.getMessage()+"\nstream="+Util.toHexString(in.getSideBuffer()),e);
+                    throw new IOException(e.getMessage()+"\nstream="+Util.toHexString(in.getSideBuffer()),e);
                 }
             }
             public OutputStream compress(OutputStream out) throws IOException {
@@ -760,13 +757,13 @@ public final class FilePath implements Serializable {
                 else
                     untarFrom(cis,GZIP);
             } catch (IOException e) {
-                throw new IOException2(String.format("Failed to unpack %s (%d bytes read of total %d)",
+                throw new IOException(String.format("Failed to unpack %s (%d bytes read of total %d)",
                         archive,cis.getByteCount(),con.getContentLength()),e);
             }
             timestamp.touch(sourceTimestamp);
             return true;
         } catch (IOException e) {
-            throw new IOException2("Failed to install "+archive+" to "+remote,e);
+            throw new IOException("Failed to install "+archive+" to "+remote,e);
         }
     }
 
@@ -786,7 +783,7 @@ public final class FilePath implements Serializable {
                         readFromTar("input stream", dir, GZIP.extract(cis));
                     }
                 } catch (IOException x) {
-                    throw new IOException2(String.format("Failed to unpack %s (%d bytes read)", archive, cis.getByteCount()), x);
+                    throw new IOException(String.format("Failed to unpack %s (%d bytes read)", archive, cis.getByteCount()), x);
                 }
             } finally {
                 in.close();
@@ -843,7 +840,7 @@ public final class FilePath implements Serializable {
             } catch (IOException e) {
                 throw e;
             } catch (Exception e) {
-                throw new IOException2(e);
+                throw new IOException(e);
             }
         } else {
             InputStream i = file.getInputStream();
@@ -910,7 +907,7 @@ public final class FilePath implements Serializable {
                 throw e;    // pass through so that the caller can catch it as AbortException
             } catch (IOException e) {
                 // wrap it into a new IOException so that we get the caller's stack trace as well.
-                throw new IOException2("remote file operation failed: "+remote+" at "+channel,e);
+                throw new IOException("remote file operation failed: "+remote+" at "+channel,e);
             }
         } else {
             // the file is on the local machine.
@@ -992,7 +989,7 @@ public final class FilePath implements Serializable {
                 .callAsync(wrapper);
         } catch (IOException e) {
             // wrap it into a new IOException so that we get the caller's stack trace as well.
-            throw new IOException2("remote file operation failed",e);
+            throw new IOException("remote file operation failed",e);
         }
     }
 
@@ -1191,7 +1188,7 @@ public final class FilePath implements Serializable {
                 }
             }));
         } catch (IOException e) {
-            throw new IOException2("Failed to create a temp file on "+remote,e);
+            throw new IOException("Failed to create a temp file on "+remote,e);
         }
     }
 
@@ -1251,7 +1248,7 @@ public final class FilePath implements Serializable {
                     try {
                         f = File.createTempFile(prefix, suffix, dir);
                     } catch (IOException e) {
-                        throw new IOException2("Failed to create a temporary directory in "+dir,e);
+                        throw new IOException("Failed to create a temporary directory in "+dir,e);
                     }
 
                     Writer w = new FileWriter(f);
@@ -1265,7 +1262,7 @@ public final class FilePath implements Serializable {
                 }
             }));
         } catch (IOException e) {
-            throw new IOException2("Failed to create a temp file on "+remote,e);
+            throw new IOException("Failed to create a temp file on "+remote,e);
         }
     }
 
@@ -1295,7 +1292,7 @@ public final class FilePath implements Serializable {
                 }
             }));
         } catch (IOException e) {
-            throw new IOException2("Failed to create a temp directory on "+remote,e);
+            throw new IOException("Failed to create a temp directory on "+remote,e);
         }
     }
 
@@ -1749,7 +1746,7 @@ public final class FilePath implements Serializable {
                 out.close();
             }
         } catch (IOException e) {
-            throw new IOException2("Failed to copy "+this+" to "+target,e);
+            throw new IOException("Failed to copy "+this+" to "+target,e);
         }
     }
 
@@ -1944,7 +1941,7 @@ public final class FilePath implements Serializable {
                 future.get();
                 return future2.get();
             } catch (ExecutionException e) {
-                throw new IOException2(e);
+                throw new IOException(e);
             }
         } else {
             // remote -> local copy
@@ -1968,7 +1965,7 @@ public final class FilePath implements Serializable {
                     throw e;    // the remote side completed successfully, so the error must be local
                 } catch (ExecutionException x) {
                     // report both errors
-                    throw new IOException2(Functions.printThrowable(e),x);
+                    throw new IOException(Functions.printThrowable(e),x);
                 } catch (TimeoutException _) {
                     // remote is hanging
                     throw e;
@@ -1977,7 +1974,7 @@ public final class FilePath implements Serializable {
             try {
                 return future.get();
             } catch (ExecutionException e) {
-                throw new IOException2(e);
+                throw new IOException(e);
             }
         }
     }
@@ -2049,12 +2046,12 @@ public final class FilePath implements Serializable {
                 }
             }
         } catch(IOException e) {
-            throw new IOException2("Failed to extract "+name,e);
+            throw new IOException("Failed to extract "+name,e);
         } catch (InterruptedException e) {
             Thread.currentThread().interrupt(); // process this later
-            throw new IOException2("Failed to extract "+name,e);
+            throw new IOException("Failed to extract "+name,e);
         } catch (IllegalAccessException e) {
-            throw new IOException2("Failed to extract "+name,e);
+            throw new IOException("Failed to extract "+name,e);
         } finally {
             t.close();
         }
@@ -2438,7 +2435,7 @@ public final class FilePath implements Serializable {
     /**
      * Used to tunnel {@link InterruptedException} over a Java signature that only allows {@link IOException}
      */
-    private static class TunneledInterruptedException extends IOException2 {
+    private static class TunneledInterruptedException extends IOException {
         private TunneledInterruptedException(InterruptedException cause) {
             super(cause);
         }
diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java
index 7ce9dea6d3456fbbab2306b7ad951265ae0215c8..dc657a9a0b6e22e2fdf74b4419db4dd96f7516b9 100644
--- a/core/src/main/java/hudson/PluginManager.java
+++ b/core/src/main/java/hudson/PluginManager.java
@@ -40,7 +40,6 @@ import hudson.security.Permission;
 import hudson.security.PermissionScope;
 import hudson.util.CyclicGraphDetector;
 import hudson.util.CyclicGraphDetector.CycleDetectedException;
-import hudson.util.IOException2;
 import hudson.util.PersistedList;
 import hudson.util.Service;
 import hudson.util.VersionNumber;
@@ -435,7 +434,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
             failedPlugins.add(new FailedPlugin(sn, e));
             activePlugins.remove(p);
             plugins.remove(p);
-            throw new IOException2("Failed to install "+ sn +" plugin",e);
+            throw new IOException("Failed to install "+ sn +" plugin",e);
         }
 
         // run initializers in the added plugin
@@ -449,7 +448,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
         try {
             new InitReactorRunner().run(r);
         } catch (ReactorException e) {
-            throw new IOException2("Failed to initialize "+ sn +" plugin",e);
+            throw new IOException("Failed to initialize "+ sn +" plugin",e);
         }
         LOGGER.info("Plugin " + sn + " dynamically installed");
     }
@@ -925,7 +924,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
                 }
             });
         } catch (SAXException x) {
-            throw new IOException2("Failed to parse XML",x);
+            throw new IOException("Failed to parse XML",x);
         } catch (ParserConfigurationException e) {
             throw new AssertionError(e); // impossible since we don't tweak XMLParser
         }
diff --git a/core/src/main/java/hudson/Proc.java b/core/src/main/java/hudson/Proc.java
index ca1f4a6767d26fedc768acb33f866f0bf0ece38b..b80d8144589a5fabdef87810f65a91f64160789f 100644
--- a/core/src/main/java/hudson/Proc.java
+++ b/core/src/main/java/hudson/Proc.java
@@ -28,7 +28,6 @@ import hudson.model.TaskListener;
 import hudson.remoting.Channel;
 import hudson.util.DaemonThreadFactory;
 import hudson.util.ExceptionCatchingThreadFactory;
-import hudson.util.IOException2;
 import hudson.util.NullStream;
 import hudson.util.StreamCopyThread;
 import hudson.util.ProcessTree;
@@ -454,7 +453,7 @@ public abstract class Proc {
             } catch (ExecutionException e) {
                 if(e.getCause() instanceof IOException)
                     throw (IOException)e.getCause();
-                throw new IOException2("Failed to join the process",e);
+                throw new IOException("Failed to join the process",e);
             } catch (CancellationException x) {
                 return -1;
             }
diff --git a/core/src/main/java/hudson/Util.java b/core/src/main/java/hudson/Util.java
index ad91672dc65a267e5a04bc0d3f4aee52d0642d90..893cd6cb233a10a417d5c7511c64eb2fcd564f07 100644
--- a/core/src/main/java/hudson/Util.java
+++ b/core/src/main/java/hudson/Util.java
@@ -30,7 +30,6 @@ import edu.umd.cs.findbugs.annotations.SuppressWarnings;
 import hudson.Proc.LocalProc;
 import hudson.model.TaskListener;
 import hudson.os.PosixAPI;
-import hudson.util.IOException2;
 import hudson.util.QuotedStringTokenizer;
 import hudson.util.VariableResolver;
 import hudson.util.jna.WinIOException;
@@ -569,7 +568,7 @@ public class Util {
             }
             return toHexString(md5.digest());
         } catch (NoSuchAlgorithmException e) {
-            throw new IOException2("MD5 not installed",e);    // impossible
+            throw new IOException("MD5 not installed",e);    // impossible
         }
         /* JENKINS-18178: confuses Maven 2 runner
         try {
diff --git a/core/src/main/java/hudson/XmlFile.java b/core/src/main/java/hudson/XmlFile.java
index 18a95412dbaca0aa3be66147a13eb805aca495b6..148578c469f7a30d16339d97ce615fad8d4fcb95 100644
--- a/core/src/main/java/hudson/XmlFile.java
+++ b/core/src/main/java/hudson/XmlFile.java
@@ -32,7 +32,6 @@ import com.thoughtworks.xstream.io.xml.XppDriver;
 import hudson.diagnosis.OldDataMonitor;
 import hudson.model.Descriptor;
 import hudson.util.AtomicFileWriter;
-import hudson.util.IOException2;
 import hudson.util.XStream2;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
@@ -142,11 +141,11 @@ public final class XmlFile {
         try {
             return xs.fromXML(in);
         } catch(StreamException e) {
-            throw new IOException2("Unable to read "+file,e);
+            throw new IOException("Unable to read "+file,e);
         } catch(ConversionException e) {
-            throw new IOException2("Unable to read "+file,e);
+            throw new IOException("Unable to read "+file,e);
         } catch(Error e) {// mostly reflection errors
-            throw new IOException2("Unable to read "+file,e);
+            throw new IOException("Unable to read "+file,e);
         } finally {
             in.close();
         }
@@ -165,11 +164,11 @@ public final class XmlFile {
             // TODO: expose XStream the driver from XStream
             return xs.unmarshal(DEFAULT_DRIVER.createReader(in), o);
         } catch (StreamException e) {
-            throw new IOException2("Unable to read "+file,e);
+            throw new IOException("Unable to read "+file,e);
         } catch(ConversionException e) {
-            throw new IOException2("Unable to read "+file,e);
+            throw new IOException("Unable to read "+file,e);
         } catch(Error e) {// mostly reflection errors
-            throw new IOException2("Unable to read "+file,e);
+            throw new IOException("Unable to read "+file,e);
         } finally {
             in.close();
         }
@@ -183,7 +182,7 @@ public final class XmlFile {
             xs.toXML(o,w);
             w.commit();
         } catch(StreamException e) {
-            throw new IOException2(e);
+            throw new IOException(e);
         } finally {
             w.abort();
         }
@@ -294,7 +293,7 @@ public final class XmlFile {
             // in such a case, assume UTF-8 rather than fail, since Jenkins internally always write XML in UTF-8
             return "UTF-8";
         } catch (SAXException e) {
-            throw new IOException2("Failed to detect encoding of "+file,e);
+            throw new IOException("Failed to detect encoding of "+file,e);
         } catch (ParserConfigurationException e) {
             throw new AssertionError(e);    // impossible
         } finally {
diff --git a/core/src/main/java/hudson/cli/CLIAction.java b/core/src/main/java/hudson/cli/CLIAction.java
index dd5327f0cf8b664f97aa3f327393a9fa79870fed..3253fc2840074f4674e69d3f45456716f0692fcd 100644
--- a/core/src/main/java/hudson/cli/CLIAction.java
+++ b/core/src/main/java/hudson/cli/CLIAction.java
@@ -31,7 +31,6 @@ import java.util.UUID;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletResponse;
 
-import hudson.util.IOException2;
 import hudson.model.UnprotectedRootAction;
 import jenkins.model.Jenkins;
 
@@ -130,7 +129,7 @@ public class CLIAction implements UnprotectedRootAction, StaplerProxy {
                     duplexChannels.get(uuid).upload(req,rsp);
                 }
             } catch (InterruptedException e) {
-                throw new IOException2(e);
+                throw new IOException(e);
             }
         }
     }
diff --git a/core/src/main/java/hudson/cli/CliProtocol2.java b/core/src/main/java/hudson/cli/CliProtocol2.java
index f1cea1add398c40724aa2ad3df51ec425bd752e1..bd3af1ee64977265cd5a6ab52dc725772daf283c 100644
--- a/core/src/main/java/hudson/cli/CliProtocol2.java
+++ b/core/src/main/java/hudson/cli/CliProtocol2.java
@@ -1,7 +1,6 @@
 package hudson.cli;
 
 import hudson.Extension;
-import hudson.util.IOException2;
 import jenkins.model.Jenkins;
 
 import javax.crypto.SecretKey;
@@ -72,7 +71,7 @@ public class CliProtocol2 extends CliProtocol {
 
                 runCli(c);
             } catch (GeneralSecurityException e) {
-                throw new IOException2("Failed to encrypt the CLI channel",e);
+                throw new IOException("Failed to encrypt the CLI channel",e);
             }
         }
     }
diff --git a/core/src/main/java/hudson/cli/InstallPluginCommand.java b/core/src/main/java/hudson/cli/InstallPluginCommand.java
index 38c04b3996da3715f7fefc7314a537f28e3d8e7e..1fd23d81acba7de5c3a4050e4925c96b797934b9 100644
--- a/core/src/main/java/hudson/cli/InstallPluginCommand.java
+++ b/core/src/main/java/hudson/cli/InstallPluginCommand.java
@@ -26,7 +26,6 @@ package hudson.cli;
 import hudson.Extension;
 import hudson.FilePath;
 import hudson.PluginManager;
-import hudson.util.IOException2;
 import jenkins.model.Jenkins;
 import hudson.model.UpdateSite;
 import hudson.model.UpdateSite.Data;
@@ -35,6 +34,7 @@ import org.kohsuke.args4j.Argument;
 import org.kohsuke.args4j.Option;
 
 import java.io.File;
+import java.io.IOException;
 import java.net.URL;
 import java.net.MalformedURLException;
 import java.util.HashSet;
@@ -114,7 +114,7 @@ public class InstallPluginCommand extends CLICommand {
                 stdout.println(Messages.InstallPluginCommand_InstallingFromUpdateCenter(source));
                 Throwable e = p.deploy(dynamicLoad).get().getError();
                 if (e!=null)
-                    throw new IOException2("Failed to install plugin "+source,e);
+                    throw new IOException("Failed to install plugin "+source,e);
                 continue;
             }
 
diff --git a/core/src/main/java/hudson/console/AnnotatedLargeText.java b/core/src/main/java/hudson/console/AnnotatedLargeText.java
index 298e034bf15ebf31a8f728b5c6bb9e7a6a82946b..4a3af765bdd04dd2831a451db7ccb5cd4d45c631 100644
--- a/core/src/main/java/hudson/console/AnnotatedLargeText.java
+++ b/core/src/main/java/hudson/console/AnnotatedLargeText.java
@@ -28,8 +28,6 @@ package hudson.console;
 import com.trilead.ssh2.crypto.Base64;
 import jenkins.model.Jenkins;
 import hudson.remoting.ObjectInputStreamEx;
-import hudson.util.IOException2;
-import hudson.util.Secret;
 import hudson.util.TimeUnit2;
 import jenkins.security.CryptoConfidentialKey;
 import org.apache.commons.io.output.ByteArrayOutputStream;
@@ -50,7 +48,6 @@ import java.io.ObjectOutputStream;
 import java.io.OutputStream;
 import java.io.Writer;
 import java.nio.charset.Charset;
-import java.security.GeneralSecurityException;
 import com.jcraft.jzlib.GZIPInputStream;
 import com.jcraft.jzlib.GZIPOutputStream;
 
@@ -134,7 +131,7 @@ public class AnnotatedLargeText<T> extends LargeText {
                 }
             }
         } catch (ClassNotFoundException e) {
-            throw new IOException2(e);
+            throw new IOException(e);
         }
         // start from scratch
         return ConsoleAnnotator.initial(context==null ? null : context.getClass());
diff --git a/core/src/main/java/hudson/console/ConsoleNote.java b/core/src/main/java/hudson/console/ConsoleNote.java
index c8ea004643309d73af2d5638bab3bf3f225d50d2..e4402c13308e848575d09169f1ef3fa50b1be3de 100644
--- a/core/src/main/java/hudson/console/ConsoleNote.java
+++ b/core/src/main/java/hudson/console/ConsoleNote.java
@@ -30,7 +30,6 @@ import hudson.model.Describable;
 import jenkins.model.Jenkins;
 import hudson.model.Run;
 import hudson.remoting.ObjectInputStreamEx;
-import hudson.util.IOException2;
 import hudson.util.IOUtils;
 import hudson.util.UnbufferedBase64InputStream;
 import org.apache.commons.codec.binary.Base64OutputStream;
@@ -228,7 +227,7 @@ public abstract class ConsoleNote<T> implements Serializable, Describable<Consol
         } catch (Error e) {
             // for example, bogus 'sz' can result in OutOfMemoryError.
             // package that up as IOException so that the caller won't fatally die.
-            throw new IOException2(e);
+            throw new IOException(e);
         }
     }
 
diff --git a/core/src/main/java/hudson/model/AbstractBuild.java b/core/src/main/java/hudson/model/AbstractBuild.java
index 49e47ed0e3de27b7a544ab2fbf0371172f9098c2..bbbc44ad62fb2d5372b8bd11424dbcaeb7f0d433 100644
--- a/core/src/main/java/hudson/model/AbstractBuild.java
+++ b/core/src/main/java/hudson/model/AbstractBuild.java
@@ -660,7 +660,7 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
                             try {
                                 l.onChangeLogParsed(build,listener,build.getChangeSet());
                             } catch (Exception e) {
-                                throw new IOException2("Failed to parse changelog",e);
+                                throw new IOException("Failed to parse changelog",e);
                             }
 
                         // Get a chance to do something after checkout and changelog is done
diff --git a/core/src/main/java/hudson/model/AbstractItem.java b/core/src/main/java/hudson/model/AbstractItem.java
index 8a19a1d169c89d448a033bcfc7471591bffdc8cf..fd3b2693aafe90e31bbc151981405e6e743d2d5e 100644
--- a/core/src/main/java/hudson/model/AbstractItem.java
+++ b/core/src/main/java/hudson/model/AbstractItem.java
@@ -40,7 +40,6 @@ import hudson.security.ACL;
 import hudson.util.AlternativeUiTextProvider;
 import hudson.util.AlternativeUiTextProvider.Message;
 import hudson.util.AtomicFileWriter;
-import hudson.util.IOException2;
 import hudson.util.IOUtils;
 import jenkins.model.Jenkins;
 import org.apache.tools.ant.taskdefs.Copy;
@@ -586,7 +585,7 @@ public abstract class AbstractItem extends Actionable implements Item, HttpDelet
                         new StreamResult(out));
                 out.close();
             } catch (TransformerException e) {
-                throw new IOException2("Failed to persist configuration.xml", e);
+                throw new IOException("Failed to persist configuration.xml", e);
             }
 
             // try to reflect the changes by reloading
diff --git a/core/src/main/java/hudson/model/Api.java b/core/src/main/java/hudson/model/Api.java
index 652fcf9e856121c986ac74767c80b917bf1e6c0b..71b617e46f8c85951bc1dae2ca642737dda2e660 100644
--- a/core/src/main/java/hudson/model/Api.java
+++ b/core/src/main/java/hudson/model/Api.java
@@ -23,7 +23,6 @@
  */
 package hudson.model;
 
-import hudson.util.IOException2;
 import jenkins.model.Jenkins;
 import jenkins.security.SecureRequester;
 
@@ -152,7 +151,7 @@ public class Api extends AbstractModelObject {
 
         } catch (DocumentException e) {
             LOGGER.log(Level.FINER, "Failed to do XPath/wrapper handling. XML is as follows:"+sw, e);
-            throw new IOException2("Failed to do XPath/wrapper handling. Turn on FINER logging to view XML.",e);
+            throw new IOException("Failed to do XPath/wrapper handling. Turn on FINER logging to view XML.",e);
         }
 
         OutputStream o = rsp.getCompressedOutputStream(req);
diff --git a/core/src/main/java/hudson/model/DirectoryBrowserSupport.java b/core/src/main/java/hudson/model/DirectoryBrowserSupport.java
index 7fd4dfd6613bdf418873625f059ae43f725aa611..5fd72727db61eb78a21e2ce1d1ac7ce33eef0729 100644
--- a/core/src/main/java/hudson/model/DirectoryBrowserSupport.java
+++ b/core/src/main/java/hudson/model/DirectoryBrowserSupport.java
@@ -25,7 +25,6 @@ package hudson.model;
 
 import hudson.FilePath;
 import hudson.Util;
-import hudson.util.IOException2;
 import jenkins.model.Jenkins;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
@@ -122,7 +121,7 @@ public final class DirectoryBrowserSupport implements HttpResponse {
         try {
             serveFile(req,rsp,base,icon,serveDirIndex);
         } catch (InterruptedException e) {
-            throw new IOException2("interrupted",e);
+            throw new IOException("interrupted",e);
         }
     }
 
diff --git a/core/src/main/java/hudson/model/DownloadService.java b/core/src/main/java/hudson/model/DownloadService.java
index 4ca6c5b616b43a4e9e33e57e7eae96b3fafcae43..273dd56e8399a7ffd7e10dee1e007283f562e92a 100644
--- a/core/src/main/java/hudson/model/DownloadService.java
+++ b/core/src/main/java/hudson/model/DownloadService.java
@@ -28,7 +28,6 @@ import hudson.ExtensionList;
 import hudson.ExtensionPoint;
 import hudson.util.FormValidation;
 import hudson.util.FormValidation.Kind;
-import hudson.util.IOException2;
 import hudson.util.IOUtils;
 import hudson.util.QuotedStringTokenizer;
 import hudson.util.TextFile;
@@ -240,7 +239,7 @@ public class DownloadService extends PageDecorator {
                     return JSONObject.fromObject(df.read());
                 } catch (JSONException e) {
                     df.delete(); // if we keep this file, it will cause repeated failures
-                    throw new IOException2("Failed to parse "+df+" into JSON",e);
+                    throw new IOException("Failed to parse "+df+" into JSON",e);
                 }
             return null;
         }
diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java
index addc19fa9c0d2a7582f34112a0f15d441940d589..f32099bc707899add95259f5bd103bf5b87c2f61 100644
--- a/core/src/main/java/hudson/model/Run.java
+++ b/core/src/main/java/hudson/model/Run.java
@@ -34,7 +34,6 @@ import hudson.BulkChange;
 import hudson.EnvVars;
 import hudson.ExtensionPoint;
 import hudson.FeedAdapter;
-import hudson.FilePath;
 import hudson.Util;
 import hudson.XmlFile;
 import hudson.cli.declarative.CLIMethod;
@@ -55,7 +54,6 @@ import hudson.tasks.BuildWrapper;
 import hudson.tasks.test.AbstractTestResultAction;
 import hudson.util.FlushProofOutputStream;
 import hudson.util.FormApply;
-import hudson.util.IOException2;
 import hudson.util.LogTaskListener;
 import hudson.util.XStream2;
 
@@ -392,7 +390,7 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
         } catch (ParseException e) {
             throw new InvalidDirectoryNameException(buildDir);
         } catch (InterruptedException e) {
-            throw new IOException2("Interrupted while resolving symlink directory "+buildDir,e);
+            throw new IOException("Interrupted while resolving symlink directory "+buildDir,e);
         }
     }
 
diff --git a/core/src/main/java/hudson/model/UpdateCenter.java b/core/src/main/java/hudson/model/UpdateCenter.java
index ba0bd6efd5930ccd61d356f4fec754643a17e9e7..068c480171ab78f3187b092bf736c7356731dc7c 100644
--- a/core/src/main/java/hudson/model/UpdateCenter.java
+++ b/core/src/main/java/hudson/model/UpdateCenter.java
@@ -44,7 +44,6 @@ import hudson.security.ACL;
 import hudson.util.DaemonThreadFactory;
 import hudson.util.FormValidation;
 import hudson.util.HttpResponses;
-import hudson.util.IOException2;
 import hudson.util.PersistedList;
 import hudson.util.XStream2;
 import jenkins.RestartRequiredException;
@@ -776,7 +775,7 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
                         job.status = job.new Installing(total==-1 ? -1 : in.getCount()*100/total);
                     }
                 } catch (IOException e) {
-                    throw new IOException2("Failed to load "+src+" to "+tmp,e);
+                    throw new IOException("Failed to load "+src+" to "+tmp,e);
                 }
 
                 in.close();
@@ -791,7 +790,7 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
 
                 return tmp;
             } catch (IOException e) {
-                throw new IOException2("Failed to download from "+src,e);
+                throw new IOException("Failed to download from "+src,e);
             }
         }
 
@@ -873,7 +872,7 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
             } catch (SSLHandshakeException e) {
                 if (e.getMessage().contains("PKIX path building failed"))
                    // fix up this crappy error message from JDK
-                    throw new IOException2("Failed to validate the SSL certificate of "+url,e);
+                    throw new IOException("Failed to validate the SSL certificate of "+url,e);
             }
         }
     }
@@ -1314,7 +1313,7 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
                 } catch (RestartRequiredException e) {
                     throw new SuccessButRequiresRestart(e.message);
                 } catch (Exception e) {
-                    throw new IOException2("Failed to dynamically deploy this plugin",e);
+                    throw new IOException("Failed to dynamically deploy this plugin",e);
                 }
             } else {
                 throw new SuccessButRequiresRestart(Messages._UpdateCenter_DownloadButNotActivated());
diff --git a/core/src/main/java/hudson/model/View.java b/core/src/main/java/hudson/model/View.java
index 266e61acf25dd78a1369086f98d756e6cde90bb2..11c350bbbe4ea434ae68ec6898f5e90786f63848 100644
--- a/core/src/main/java/hudson/model/View.java
+++ b/core/src/main/java/hudson/model/View.java
@@ -50,7 +50,6 @@ import hudson.util.AlternativeUiTextProvider.Message;
 import hudson.util.DescribableList;
 import hudson.util.DescriptorList;
 import hudson.util.FormApply;
-import hudson.util.IOException2;
 import hudson.util.RunList;
 import hudson.util.XStream2;
 import hudson.views.ListViewColumn;
@@ -1085,7 +1084,7 @@ public abstract class View extends AbstractModelObject implements AccessControll
                     new StreamResult(out));
             out.close();
         } catch (TransformerException e) {
-            throw new IOException2("Failed to persist configuration.xml", e);
+            throw new IOException("Failed to persist configuration.xml", e);
         }
 
         // try to reflect the changes by reloading
@@ -1097,11 +1096,11 @@ public abstract class View extends AbstractModelObject implements AccessControll
             Jenkins.XSTREAM.unmarshal(new XppDriver().createReader(in), this);
             name = oldname;
         } catch (StreamException e) {
-            throw new IOException2("Unable to read",e);
+            throw new IOException("Unable to read",e);
         } catch(ConversionException e) {
-            throw new IOException2("Unable to read",e);
+            throw new IOException("Unable to read",e);
         } catch(Error e) {// mostly reflection errors
-            throw new IOException2("Unable to read",e);
+            throw new IOException("Unable to read",e);
         } finally {
             in.close();
         }
@@ -1210,11 +1209,11 @@ public abstract class View extends AbstractModelObject implements AccessControll
             checkGoodName(v.name);
             return v;
         } catch(StreamException e) {
-            throw new IOException2("Unable to read",e);
+            throw new IOException("Unable to read",e);
         } catch(ConversionException e) {
-            throw new IOException2("Unable to read",e);
+            throw new IOException("Unable to read",e);
         } catch(Error e) {// mostly reflection errors
-            throw new IOException2("Unable to read",e);
+            throw new IOException("Unable to read",e);
         } finally {
             in.close();
         }
diff --git a/core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java b/core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java
index 6248b84d86204cb1342c1983fc974cd3b24ef203..c259f891ee204d9ba3f2e3bf9cc3f95bf9917dab 100644
--- a/core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java
+++ b/core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java
@@ -28,10 +28,6 @@ import hudson.Extension;
 import hudson.slaves.OfflineCause;
 import hudson.model.Computer;
 import hudson.remoting.Callable;
-import hudson.remoting.Future;
-import hudson.util.ClockDifference;
-import hudson.util.TimeUnit2;
-import hudson.util.IOException2;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.StaplerRequest;
 
@@ -39,9 +35,6 @@ import java.io.IOException;
 import java.io.Serializable;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 import java.util.logging.Logger;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
diff --git a/core/src/main/java/hudson/os/windows/WindowsRemoteLauncher.java b/core/src/main/java/hudson/os/windows/WindowsRemoteLauncher.java
index 9b4d16c8127462880997be88ab3ef06a0bd83809..c64c3c6c216583c01db0202a3f20b9225dbb1279 100644
--- a/core/src/main/java/hudson/os/windows/WindowsRemoteLauncher.java
+++ b/core/src/main/java/hudson/os/windows/WindowsRemoteLauncher.java
@@ -7,7 +7,6 @@ import hudson.Util;
 import hudson.model.Computer;
 import hudson.model.TaskListener;
 import hudson.remoting.Channel;
-import hudson.util.IOException2;
 import hudson.util.StreamCopyThread;
 import org.jinterop.dcom.common.JIException;
 import org.jvnet.hudson.remcom.WindowsRemoteProcessLauncher;
@@ -56,9 +55,9 @@ public class WindowsRemoteLauncher extends Launcher {
         try {
             proc = launcher.launch(buildCommandLine(ps), ps.pwd().getRemote());
         } catch (JIException e) {
-            throw new IOException2(e);
+            throw new IOException(e);
         } catch (InterruptedException e) {
-            throw new IOException2(e);
+            throw new IOException(e);
         }
         final Thread t1 = new StreamCopyThread("stdout copier: "+name, proc.getInputStream(), ps.stdout(),false);
         t1.start();
@@ -117,7 +116,7 @@ public class WindowsRemoteLauncher extends Launcher {
             return new Channel("channel over named pipe to "+launcher.getHostName(),
                 Computer.threadPoolForRemoting, proc.getInputStream(), new BufferedOutputStream(proc.getOutputStream()));
         } catch (JIException e) {
-            throw new IOException2(e);
+            throw new IOException(e);
         }
     }
 
diff --git a/core/src/main/java/hudson/slaves/SlaveComputer.java b/core/src/main/java/hudson/slaves/SlaveComputer.java
index 05e203784edf34a2014a2eb21d2f2abc696bfdbd..f8abf2726aaa3065f61727c7408cf921b1738961 100644
--- a/core/src/main/java/hudson/slaves/SlaveComputer.java
+++ b/core/src/main/java/hudson/slaves/SlaveComputer.java
@@ -24,7 +24,6 @@
 package hudson.slaves;
 
 import hudson.model.*;
-import hudson.util.IOException2;
 import hudson.util.IOUtils;
 import hudson.util.io.ReopenableRotatingFileOutputStream;
 import jenkins.model.Jenkins.MasterComputer;
@@ -72,7 +71,6 @@ import javax.crypto.spec.SecretKeySpec;
 import javax.servlet.RequestDispatcher;
 import jenkins.model.Jenkins;
 import jenkins.slaves.JnlpSlaveAgentProtocol;
-import org.acegisecurity.Authentication;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 import org.kohsuke.stapler.QueryParameter;
@@ -613,7 +611,7 @@ public class SlaveComputer extends Computer {
                 c.init(Cipher.ENCRYPT_MODE, key, new IvParameterSpec(iv));
                 encrypted = c.doFinal(baos.toByteArray());
             } catch (GeneralSecurityException x) {
-                throw new IOException2(x);
+                throw new IOException(x);
             }
             res.setContentType("application/octet-stream");
             res.getOutputStream().write(iv);
diff --git a/core/src/main/java/hudson/tasks/Fingerprinter.java b/core/src/main/java/hudson/tasks/Fingerprinter.java
index f39828708bff6531ca94d264b18fc6a4e57ac653..f18504376a9f8114c3b09bf9fd509f79e062c5c4 100644
--- a/core/src/main/java/hudson/tasks/Fingerprinter.java
+++ b/core/src/main/java/hudson/tasks/Fingerprinter.java
@@ -47,7 +47,6 @@ import hudson.model.Run;
 import hudson.model.TaskListener;
 import hudson.remoting.VirtualChannel;
 import hudson.util.FormValidation;
-import hudson.util.IOException2;
 import hudson.util.PackedMap;
 import hudson.util.RunList;
 import net.sf.json.JSONObject;
@@ -238,9 +237,9 @@ public class Fingerprinter extends Recorder implements Serializable, DependencyD
                     try {
                         results.add(new Record(produced,f,file.getName(),new FilePath(file).digest()));
                     } catch (IOException e) {
-                        throw new IOException2(Messages.Fingerprinter_DigestFailed(file),e);
+                        throw new IOException(Messages.Fingerprinter_DigestFailed(file),e);
                     } catch (InterruptedException e) {
-                        throw new IOException2(Messages.Fingerprinter_Aborted(),e);
+                        throw new IOException(Messages.Fingerprinter_Aborted(),e);
                     }
                 }
 
diff --git a/core/src/main/java/hudson/tasks/junit/SuiteResult.java b/core/src/main/java/hudson/tasks/junit/SuiteResult.java
index 4488834d325d9e20e1427e58d93deee9f16823ca..d6eb5b183f0809f36947b93fe581be827d1872cf 100644
--- a/core/src/main/java/hudson/tasks/junit/SuiteResult.java
+++ b/core/src/main/java/hudson/tasks/junit/SuiteResult.java
@@ -24,9 +24,7 @@
 package hudson.tasks.junit;
 
 import hudson.tasks.test.TestObject;
-import hudson.util.IOException2;
 import hudson.util.io.ParserConfigurator;
-import org.apache.commons.io.FileUtils;
 import org.dom4j.Document;
 import org.dom4j.DocumentException;
 import org.dom4j.Element;
@@ -36,12 +34,7 @@ import org.kohsuke.stapler.export.ExportedBean;
 
 import java.io.File;
 import java.io.IOException;
-import java.io.RandomAccessFile;
 import java.io.Serializable;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.channels.FileChannel;
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -212,7 +205,7 @@ public final class SuiteResult implements Serializable {
                     try {
                         stdout = CaseResult.possiblyTrimStdio(cases, keepLongStdio, mavenOutputFile);
                     } catch (IOException e) {
-                        throw new IOException2("Failed to read "+mavenOutputFile,e);
+                        throw new IOException("Failed to read "+mavenOutputFile,e);
                     }
                 }
             }
diff --git a/core/src/main/java/hudson/tasks/junit/TestResult.java b/core/src/main/java/hudson/tasks/junit/TestResult.java
index dea36a7f5bc95e323e8f5efcbae6ef1797a629ba..5010a6e87f674a2fff8f041b7f4bc1ffc8b74728 100644
--- a/core/src/main/java/hudson/tasks/junit/TestResult.java
+++ b/core/src/main/java/hudson/tasks/junit/TestResult.java
@@ -30,7 +30,6 @@ import hudson.model.Run;
 import hudson.tasks.test.AbstractTestResultAction;
 import hudson.tasks.test.MetaTabulatedResult;
 import hudson.tasks.test.TestObject;
-import hudson.util.IOException2;
 
 import java.io.File;
 import java.io.IOException;
@@ -274,12 +273,12 @@ public final class TestResult extends MetaTabulatedResult {
             for (SuiteResult suiteResult : SuiteResult.parse(reportFile, keepLongStdio))
                 add(suiteResult);
         } catch (InterruptedException e) {
-            throw new IOException2("Failed to read "+reportFile,e);
+            throw new IOException("Failed to read "+reportFile,e);
         } catch (RuntimeException e) {
-            throw new IOException2("Failed to read "+reportFile,e);
+            throw new IOException("Failed to read "+reportFile,e);
         } catch (DocumentException e) {
             if (!reportFile.getPath().endsWith(".xml")) {
-                throw new IOException2("Failed to read "+reportFile+"\n"+
+                throw new IOException("Failed to read "+reportFile+"\n"+
                     "Is this really a JUnit report file? Your configuration must be matching too many files",e);
             } else {
                 SuiteResult sr = new SuiteResult(reportFile.getName(), "", "");
diff --git a/core/src/main/java/hudson/util/AtomicFileWriter.java b/core/src/main/java/hudson/util/AtomicFileWriter.java
index c951a735c6d9b5fda3941d670ae50e6e798a0241..46c0a261edbadd501df130c2173eed122bf12ee0 100644
--- a/core/src/main/java/hudson/util/AtomicFileWriter.java
+++ b/core/src/main/java/hudson/util/AtomicFileWriter.java
@@ -64,7 +64,7 @@ public class AtomicFileWriter extends Writer {
             dir.mkdirs();
             tmpFile = File.createTempFile("atomic",null, dir);
         } catch (IOException e) {
-            throw new IOException2("Failed to create a temporary file in "+ dir,e);
+            throw new IOException("Failed to create a temporary file in "+ dir,e);
         }
         destFile = f;
         if (encoding==null)
diff --git a/core/src/main/java/hudson/util/IOException2.java b/core/src/main/java/hudson/util/IOException2.java
index 4f144c552f5cf39ae2afa8d3f74fc5157f35852f..a4ee558ad7ab008bc37ac36137aedc372e8b48ba 100644
--- a/core/src/main/java/hudson/util/IOException2.java
+++ b/core/src/main/java/hudson/util/IOException2.java
@@ -29,21 +29,17 @@ import java.io.IOException;
  * {@link IOException} with linked exception.
  *
  * @author Kohsuke Kawaguchi
+ * @deprecated Just use {@link IOException}, which since Java 6 supports a cause.
  */
+@Deprecated
 public class IOException2 extends IOException  {
-    private final Throwable cause;
 
     public IOException2(Throwable cause) {
-        super(cause.getMessage());
-        this.cause = cause;
+        super(cause);
     }
 
     public IOException2(String s, Throwable cause) {
-        super(s);
-        this.cause = cause;
+        super(s, cause);
     }
 
-    public Throwable getCause() {
-        return cause;
-    }
 }
diff --git a/core/src/main/java/hudson/util/RemotingDiagnostics.java b/core/src/main/java/hudson/util/RemotingDiagnostics.java
index 408c9931f4d998b760f625fda817f6f526bdb999..82f7040b75aa0dd514372f05e9fe8f326471a897 100644
--- a/core/src/main/java/hudson/util/RemotingDiagnostics.java
+++ b/core/src/main/java/hudson/util/RemotingDiagnostics.java
@@ -172,7 +172,7 @@ public final class RemotingDiagnostics {
 
                     return new FilePath(hprof);
                 } catch (JMException e) {
-                    throw new IOException2(e);
+                    throw new IOException(e);
                 }
             }
 
diff --git a/core/src/main/java/hudson/util/io/ReopenableFileOutputStream.java b/core/src/main/java/hudson/util/io/ReopenableFileOutputStream.java
index 9a68052653d6011851e9789e186c29ab4a2a501f..e35d8816e38d988f96457457e8233912f4574457 100644
--- a/core/src/main/java/hudson/util/io/ReopenableFileOutputStream.java
+++ b/core/src/main/java/hudson/util/io/ReopenableFileOutputStream.java
@@ -23,8 +23,6 @@
  */
 package hudson.util.io;
 
-import hudson.util.IOException2;
-
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -55,7 +53,7 @@ public class ReopenableFileOutputStream extends OutputStream {
             try {
                 current = new FileOutputStream(out,appendOnNextOpen);
             } catch (FileNotFoundException e) {
-                throw new IOException2("Failed to open "+out,e);
+                throw new IOException("Failed to open "+out,e);
             }
         return current;
     }
diff --git a/core/src/main/java/hudson/util/io/TarArchiver.java b/core/src/main/java/hudson/util/io/TarArchiver.java
index 6bd89c6edd2264e69803688928d8f2957b8b5e4a..7e7a3dd4f0ec1a14981f98fc64a2cfdfbb40a87d 100644
--- a/core/src/main/java/hudson/util/io/TarArchiver.java
+++ b/core/src/main/java/hudson/util/io/TarArchiver.java
@@ -28,7 +28,6 @@ import hudson.Functions;
 import hudson.org.apache.tools.tar.TarOutputStream;
 import hudson.os.PosixException;
 import hudson.util.FileVisitor;
-import hudson.util.IOException2;
 import hudson.util.IOUtils;
 import org.apache.tools.tar.TarEntry;
 
@@ -80,7 +79,7 @@ final class TarArchiver extends Archiver {
             linkName.setLength(0);
             linkName.append(target);
         } catch (IllegalAccessException x) {
-            throw new IOException2("Failed to set linkName", x);
+            throw new IOException("Failed to set linkName", x);
         }
 
         tar.putNextEntry(e);
diff --git a/core/src/main/java/hudson/util/ssh/SFTPClient.java b/core/src/main/java/hudson/util/ssh/SFTPClient.java
index 699e869ad1a365b690164ca433756ece3a6c5d70..2ce255b98094a9d7de652d55fa5e51cbca175a15 100644
--- a/core/src/main/java/hudson/util/ssh/SFTPClient.java
+++ b/core/src/main/java/hudson/util/ssh/SFTPClient.java
@@ -6,7 +6,6 @@ import com.trilead.ssh2.SFTPv3Client;
 import com.trilead.ssh2.SFTPv3FileAttributes;
 import com.trilead.ssh2.SFTPv3FileHandle;
 import com.trilead.ssh2.sftp.ErrorCodes;
-import hudson.util.IOException2;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -62,7 +61,7 @@ public class SFTPClient extends SFTPv3Client {
         try {
             mkdir(path, posixPermission);
         } catch (IOException e) {
-            throw new IOException2("Failed to mkdir "+path,e);
+            throw new IOException("Failed to mkdir "+path,e);
         }
     }
 
diff --git a/core/src/main/java/hudson/widgets/RenderOnDemandClosure.java b/core/src/main/java/hudson/widgets/RenderOnDemandClosure.java
index 6591d3c22df0452e1daaa9654eb528582aaf6463..05c3611a86d242f74d1049c43e87af6339234f32 100644
--- a/core/src/main/java/hudson/widgets/RenderOnDemandClosure.java
+++ b/core/src/main/java/hudson/widgets/RenderOnDemandClosure.java
@@ -25,7 +25,6 @@ package hudson.widgets;
 
 import hudson.Util;
 import hudson.model.Descriptor;
-import hudson.util.IOException2;
 import hudson.util.PackedMap;
 import org.apache.commons.jelly.JellyContext;
 import org.apache.commons.jelly.JellyTagException;
@@ -124,7 +123,7 @@ public class RenderOnDemandClosure {
                     }.invokeScript(req,rsp,bodyStack[0],null);
                 } catch (JellyTagException e) {
                     LOGGER.log(Level.WARNING, "Failed to evaluate the template closure", e);
-                    throw new IOException2("Failed to evaluate the template closure",e);
+                    throw new IOException("Failed to evaluate the template closure",e);
                 }
             }
         };
diff --git a/core/src/main/java/jenkins/security/DefaultConfidentialStore.java b/core/src/main/java/jenkins/security/DefaultConfidentialStore.java
index 476f437f9f0d5dee40be717ec498acd67df3221b..4a4667de6de3b1334c02da622e480d59ba9250ec 100644
--- a/core/src/main/java/jenkins/security/DefaultConfidentialStore.java
+++ b/core/src/main/java/jenkins/security/DefaultConfidentialStore.java
@@ -2,7 +2,6 @@ package jenkins.security;
 
 import hudson.FilePath;
 import hudson.Util;
-import hudson.util.IOException2;
 import hudson.util.IOUtils;
 import hudson.util.Secret;
 import hudson.util.TextFile;
@@ -80,7 +79,7 @@ public class DefaultConfidentialStore extends ConfidentialStore {
             cos.write(payload);
             cos.write(MAGIC);
         } catch (GeneralSecurityException e) {
-            throw new IOException2("Failed to persist the key: "+key.getId(),e);
+            throw new IOException("Failed to persist the key: "+key.getId(),e);
         } finally {
             IOUtils.closeQuietly(cos);
             IOUtils.closeQuietly(fos);
@@ -107,7 +106,7 @@ public class DefaultConfidentialStore extends ConfidentialStore {
             byte[] bytes = IOUtils.toByteArray(cis);
             return verifyMagic(bytes);
         } catch (GeneralSecurityException e) {
-            throw new IOException2("Failed to persist the key: "+key.getId(),e);
+            throw new IOException("Failed to persist the key: "+key.getId(),e);
         } finally {
             IOUtils.closeQuietly(cis);
             IOUtils.closeQuietly(fis);
diff --git a/core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol2.java b/core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol2.java
index 86da2de8ae2275d48dd8c49f9f11b5feff3d7960..bcd857c9686d3b96673cd9f7da050cf8e1ce959d 100644
--- a/core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol2.java
+++ b/core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol2.java
@@ -6,7 +6,6 @@ import hudson.Util;
 import hudson.remoting.Channel;
 import hudson.remoting.Engine;
 import hudson.slaves.SlaveComputer;
-import hudson.util.IOException2;
 import jenkins.model.Jenkins;
 
 import java.io.ByteArrayInputStream;
@@ -80,9 +79,9 @@ public class JnlpSlaveAgentProtocol2 extends JnlpSlaveAgentProtocol {
                     try {
                         computer.disconnect(new ConnectionFromCurrentPeer()).get(15, TimeUnit.SECONDS);
                     } catch (ExecutionException e) {
-                        throw new IOException2("Failed to disconnect the current client",e);
+                        throw new IOException("Failed to disconnect the current client",e);
                     } catch (TimeoutException e) {
-                        throw new IOException2("Failed to disconnect the current client",e);
+                        throw new IOException("Failed to disconnect the current client",e);
                     }
                 } else {
                     error(out, nodeName + " is already connected to this master. Rejecting this connection.");
diff --git a/core/src/main/resources/META-INF/upgrade/IOException2.hint b/core/src/main/resources/META-INF/upgrade/IOException2.hint
new file mode 100644
index 0000000000000000000000000000000000000000..23a5e04be165083c8fe4e8c7c3a8d3567f07e43a
--- /dev/null
+++ b/core/src/main/resources/META-INF/upgrade/IOException2.hint
@@ -0,0 +1,2 @@
+new hudson.util.IOException2($t) :: $t instanceof Throwable => new java.io.IOException($t);;
+new hudson.util.IOException2($s, $t) :: $s instanceof String && $t instanceof Throwable => new java.io.IOException($s, $t);;
diff --git a/core/src/test/java/hudson/FilePathTest.java b/core/src/test/java/hudson/FilePathTest.java
index 762d0e7d96d67bf3e8de314aec4506bd1b25aece..6749d1fa614282a13ee5bbfb60709f7abd97107f 100644
--- a/core/src/test/java/hudson/FilePathTest.java
+++ b/core/src/test/java/hudson/FilePathTest.java
@@ -28,7 +28,6 @@ import hudson.FilePath.TarCompression;
 import hudson.model.TaskListener;
 import hudson.remoting.LocalChannel;
 import hudson.remoting.VirtualChannel;
-import hudson.util.IOException2;
 import hudson.util.NullStream;
 
 import java.io.ByteArrayInputStream;
@@ -142,9 +141,9 @@ public class FilePathTest extends ChannelTestCase {
                         private Exception closed;
                         private volatile int count;
 
-                        private void checkNotClosed() throws IOException2 {
+                        private void checkNotClosed() throws IOException {
                             if (closed != null)
-                                throw new IOException2(closed);
+                                throw new IOException(closed);
                         }
 
                         @Override
diff --git a/test/src/main/java/org/jvnet/hudson/test/TemporaryDirectoryAllocator.java b/test/src/main/java/org/jvnet/hudson/test/TemporaryDirectoryAllocator.java
index d28442e9845de02547aed322044bb0c0a4bdcfc2..e21dc4526eece62a96311c499d85a0e635e4a084 100644
--- a/test/src/main/java/org/jvnet/hudson/test/TemporaryDirectoryAllocator.java
+++ b/test/src/main/java/org/jvnet/hudson/test/TemporaryDirectoryAllocator.java
@@ -24,7 +24,6 @@
 package org.jvnet.hudson.test;
 
 import hudson.FilePath;
-import hudson.util.IOException2;
 
 import java.io.File;
 import java.io.IOException;
@@ -68,7 +67,7 @@ public class TemporaryDirectoryAllocator {
             tmpDirectories.add(f);
             return f;
         } catch (IOException e) {
-            throw new IOException2("Failed to create a temporary directory in "+base,e);
+            throw new IOException("Failed to create a temporary directory in "+base,e);
         }
     }
 
@@ -84,7 +83,7 @@ public class TemporaryDirectoryAllocator {
                 x = e;
             }
         tmpDirectories.clear();
-        if (x!=null)    throw new IOException2("Failed to clean up temp dirs",x);
+        if (x!=null)    throw new IOException("Failed to clean up temp dirs",x);
     }
 
     /**