diff --git a/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerHarness.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerHarness.java
index 32eef8aa57f9..3160a0b430e5 100644
--- a/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerHarness.java
+++ b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/platform/NbPlatformCustomizerHarness.java
@@ -194,6 +194,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
     private void browseButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_browseButtonActionPerformed
         JFileChooser jfc = new JFileChooser() {
             // Trick stolen from ProjectChooserAccessory.ProjectFileChooser:
+            @Override
             public void approveSelection() {
                 File dir = FileUtil.normalizeFile(getSelectedFile());
                 if (NbPlatform.isHarness(dir)) {
@@ -203,7 +204,6 @@ public void approveSelection() {
                 }
             }
         };
-        FileUtil.preventFileChooserSymlinkTraversal(jfc, null);
         jfc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
         jfc.setSelectedFile(plaf.getHarnessLocation());
         if (jfc.showOpenDialog(this) == JFileChooser.APPROVE_OPTION) {
diff --git a/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templatePanelVisual.javx b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templatePanelVisual.javx
index e32f5508dc4b..609b2aab75f5 100644
--- a/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templatePanelVisual.javx
+++ b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/project/templatePanelVisual.javx
@@ -132,7 +132,6 @@ public class ${TEMPLATENAME}PanelVisual extends JPanel implements DocumentListen
         String command = evt.getActionCommand();
         if ("BROWSE".equals(command)) {
             JFileChooser chooser = new JFileChooser();
-            FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
             chooser.setDialogTitle("Select Project Location");
             chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
             String path = this.projectLocationTextField.getText();
diff --git a/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/PanelProjectLocationVisual.java b/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/PanelProjectLocationVisual.java
index 0b14c69aa69b..d66e3cefa96f 100644
--- a/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/PanelProjectLocationVisual.java
+++ b/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/PanelProjectLocationVisual.java
@@ -216,7 +216,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
 
     private void browseLocationJButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_browseLocationJButtonActionPerformed
             JFileChooser chooser = new JFileChooser ();
-            FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
             chooser.setDialogTitle(NbBundle.getMessage(PanelProjectLocationVisual.class,"GetProjectLocationPanel.FileChooserTitle"));
             chooser.setFileSelectionMode (JFileChooser.DIRECTORIES_ONLY);
             String path = projectLocationTextField.getText().trim();
diff --git a/contrib/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/customizer/CustomizerSupport.java b/contrib/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/customizer/CustomizerSupport.java
index c64e12fa90e0..1ffeb25ce7ee 100644
--- a/contrib/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/customizer/CustomizerSupport.java
+++ b/contrib/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/customizer/CustomizerSupport.java
@@ -604,7 +604,6 @@ public void actionPerformed(ActionEvent e) {
 
         private void addPathElement () {
             JFileChooser chooser = new JFileChooser();
-            FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
             chooser.setMultiSelectionEnabled (true);
             String title = null;
             String message = null;
@@ -630,9 +629,7 @@ private void addPathElement () {
             //#61789 on old macosx (jdk 1.4.1) these two method need to be called in this order.
             chooser.setAcceptAllFileFilterUsed( false );
             chooser.setFileFilter (new SimpleFileFilter(message,new String[] {"ZIP","JAR"}));   //NOI18N
-            if (this.currentDir != null && currentDir.exists()) {
-                chooser.setCurrentDirectory(this.currentDir);
-            }
+            chooser.setCurrentDirectory(this.currentDir != null && currentDir.exists() ? this.currentDir : null);
             if (chooser.showOpenDialog(this)==JFileChooser.APPROVE_OPTION) {
                 File[] fs = chooser.getSelectedFiles();
                 PathModel model = (PathModel) this.resources.getModel();
diff --git a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/ui/service/subpanels/KeystorePanel.form b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/ui/service/subpanels/KeystorePanel.form
index e81d6386c3a6..2f09890846a8 100644
--- a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/ui/service/subpanels/KeystorePanel.form
+++ b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/ui/service/subpanels/KeystorePanel.form
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 
 <!--
 
diff --git a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/ui/service/subpanels/KeystorePanel.java b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/ui/service/subpanels/KeystorePanel.java
index b7a7ff87d96e..c6f61b79a367 100644
--- a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/ui/service/subpanels/KeystorePanel.java
+++ b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/ui/service/subpanels/KeystorePanel.java
@@ -375,18 +375,15 @@ private void loadkeysButtonActionPerformed(java.awt.event.ActionEvent evt) {//GE
     
     private void keystoreLocationButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_keystoreLocationButtonActionPerformed
         JFileChooser chooser = new JFileChooser();
-        FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
         chooser.setDialogTitle(NbBundle.getMessage(KeystorePanel.class, "LBL_KeystoreBrowse_Title")); //NOI18N
         chooser.setFileSelectionMode (JFileChooser.FILES_ONLY);
         chooser.setMultiSelectionEnabled(false);
         chooser.setFileFilter(new StoreFileFilter());
         File f = new File(keystoreLocationTextField.getText());
-        if ((f != null) && (f.exists())) {
-            if (f.isDirectory()) {
-                chooser.setCurrentDirectory(f);
-            } else {
-                chooser.setCurrentDirectory(f.getParentFile());
-            }
+        if (f.exists()) {
+            chooser.setCurrentDirectory(f);
+        } else {
+            chooser.setCurrentDirectory(null);
         }
         if (chooser.showOpenDialog(this)== JFileChooser.APPROVE_OPTION) {
             File file = chooser.getSelectedFile();
diff --git a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/ui/service/subpanels/TruststorePanel.form b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/ui/service/subpanels/TruststorePanel.form
index 3401ddf0127c..0aca57a46f93 100644
--- a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/ui/service/subpanels/TruststorePanel.form
+++ b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/ui/service/subpanels/TruststorePanel.form
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 
 <!--
 
diff --git a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/ui/service/subpanels/TruststorePanel.java b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/ui/service/subpanels/TruststorePanel.java
index b28c42d6163c..9f0dc87143d7 100644
--- a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/ui/service/subpanels/TruststorePanel.java
+++ b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/ui/service/subpanels/TruststorePanel.java
@@ -335,18 +335,15 @@ private void loadkeysButtonActionPerformed(java.awt.event.ActionEvent evt) {//GE
     
     private void storeLocationButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_storeLocationButtonActionPerformed
         JFileChooser chooser = new JFileChooser();
-        FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
         chooser.setDialogTitle(NbBundle.getMessage(TruststorePanel.class, "LBL_TruststoreBrowse_Title")); //NOI18N
         chooser.setFileSelectionMode (JFileChooser.FILES_ONLY);
         chooser.setMultiSelectionEnabled(false);
         chooser.setFileFilter(new StoreFileFilter());
         File f = new File(storeLocationTextField.getText());
-        if ((f != null) && (f.exists())) {
-            if (f.isDirectory()) {
-                chooser.setCurrentDirectory(f);
-            } else {
-                chooser.setCurrentDirectory(f.getParentFile());
-            }
+        if (f.exists()) {
+            chooser.setCurrentDirectory(f);
+        } else {
+            chooser.setCurrentDirectory(null);
         }
         if (chooser.showOpenDialog(this)== JFileChooser.APPROVE_OPTION) {
             File file = chooser.getSelectedFile();
diff --git a/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerRun.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerRun.java
index f4eb0d34acc3..3d24edc4ef8e 100644
--- a/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerRun.java
+++ b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerRun.java
@@ -269,7 +269,6 @@ public void itemStateChanged(java.awt.event.ItemEvent evt) {
             
     private void jButtonWorkingDirectoryBrowseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButtonWorkingDirectoryBrowseActionPerformed
         JFileChooser chooser = new JFileChooser();
-        FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
         chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
         chooser.setMultiSelectionEnabled(false);
         
diff --git a/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerSources.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerSources.java
index 3a28e94d086e..05c2a14a5e21 100644
--- a/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerSources.java
+++ b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerSources.java
@@ -546,7 +546,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
 
     private void configFilesFolderBrowseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_configFilesFolderBrowseActionPerformed
         JFileChooser chooser = new JFileChooser();
-        FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
         chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
         File fileName = new File(jTextFieldConfigFilesFolder.getText());
         File configFiles = fileName.isAbsolute() ? fileName : new File(projectFld, fileName.getPath());
diff --git a/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/PanelSourceFolders.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/PanelSourceFolders.java
index ce07c04182cc..b36dd3b78503 100644
--- a/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/PanelSourceFolders.java
+++ b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/PanelSourceFolders.java
@@ -384,7 +384,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
 
     private void jButtonLibrariesActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButtonLibrariesActionPerformed
         JFileChooser chooser = new JFileChooser();
-        FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
         chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
         if (jTextFieldLibraries.getText().length() > 0 && getLibraries().exists()) {
             chooser.setSelectedFile(getLibraries());
@@ -399,7 +398,6 @@ private void jButtonLibrariesActionPerformed(java.awt.event.ActionEvent evt) {//
 
     private void jButtonConfigFilesLocationActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButtonConfigFilesLocationActionPerformed
         JFileChooser chooser = new JFileChooser();
-        FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
         chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
         if (jTextFieldConfigFiles.getText().length() > 0 && getConfigFiles().exists()) {
             chooser.setSelectedFile(getConfigFiles());
diff --git a/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/CustomizerSources.java b/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/CustomizerSources.java
index 1af0f3dd26e9..3e4f43f9dc89 100644
--- a/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/CustomizerSources.java
+++ b/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/CustomizerSources.java
@@ -433,7 +433,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
     
     private void jButtonBrowseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButtonBrowseActionPerformed
         JFileChooser chooser = new JFileChooser();
-        FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
         chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
         File fileName = new File(jTextFieldConfigFilesFolder.getText());
         File configFiles = fileName.isAbsolute() ? fileName : new File(projectFld, fileName.getPath());
diff --git a/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/PanelSourceFolders.form b/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/PanelSourceFolders.form
index 08199954acbb..f3a81a1f1081 100644
--- a/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/PanelSourceFolders.form
+++ b/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/PanelSourceFolders.form
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 
 <!--
 
diff --git a/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/PanelSourceFolders.java b/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/PanelSourceFolders.java
index 51da577876c5..6d6ba39d485d 100644
--- a/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/PanelSourceFolders.java
+++ b/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/PanelSourceFolders.java
@@ -385,7 +385,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
 
     private void jButtonLibrariesActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButtonLibrariesActionPerformed
         JFileChooser chooser = new JFileChooser();
-        FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
         chooser.setFileSelectionMode (JFileChooser.DIRECTORIES_ONLY);
         if (jTextFieldLibraries.getText().length() > 0 && getLibraries().exists()) {
             chooser.setSelectedFile(getLibraries());
@@ -400,7 +399,6 @@ private void jButtonLibrariesActionPerformed(java.awt.event.ActionEvent evt) {//
 
     private void jButtonConfigFilesLocationActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButtonConfigFilesLocationActionPerformed
         JFileChooser chooser = new JFileChooser();
-        FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
         chooser.setFileSelectionMode (JFileChooser.DIRECTORIES_ONLY);
         if (jTextFieldConfigFiles.getText().length() > 0 && getConfigFiles().exists()) {
             chooser.setSelectedFile(getConfigFiles());
diff --git a/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/sharability/ServerVolumeCustomizer.java b/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/sharability/ServerVolumeCustomizer.java
index d1fff009181e..494855636204 100644
--- a/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/sharability/ServerVolumeCustomizer.java
+++ b/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/sharability/ServerVolumeCustomizer.java
@@ -286,7 +286,6 @@ private void addResource(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_addR
             baseFolder = new File(URI.create(area.getLocation().toExternalForm())).getParentFile();
         }
         FileChooser chooser = new FileChooser(baseFolder, baseFolder);
-        FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
         chooser.setAcceptAllFileFilterUsed(false);
         if (!this.volumeType.equals(ServerLibraryTypeProvider.VOLUME_JAVADOC)
                 && !this.volumeType.equals(ServerLibraryTypeProvider.VOLUME_SOURCE)) {
diff --git a/enterprise/jakarta.transformer/src/org/netbeans/modules/fish/payara/jakarta/transformer/TransformerPanelVisual.java b/enterprise/jakarta.transformer/src/org/netbeans/modules/fish/payara/jakarta/transformer/TransformerPanelVisual.java
index 0d238ae1549e..3b3f9bec8b9c 100644
--- a/enterprise/jakarta.transformer/src/org/netbeans/modules/fish/payara/jakarta/transformer/TransformerPanelVisual.java
+++ b/enterprise/jakarta.transformer/src/org/netbeans/modules/fish/payara/jakarta/transformer/TransformerPanelVisual.java
@@ -140,9 +140,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
     private void selectSourceButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_selectSourceButtonActionPerformed
         String command = evt.getActionCommand();
         if ("BROWSE".equals(command)) {
-            JFileChooser chooser = new JFileChooser();
-            //FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
-            chooser.setCurrentDirectory(chooser.getCurrentDirectory());            
+            JFileChooser chooser = new JFileChooser();      
             chooser.setDialogTitle("Select source to transform");
             chooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
             String path = this.source.getText();
@@ -163,9 +161,7 @@ private void selectSourceButtonActionPerformed(java.awt.event.ActionEvent evt) {
     private void selectTargetButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_selectTargetButtonActionPerformed
         String command = evt.getActionCommand();
         if ("BROWSE".equals(command)) {
-            JFileChooser chooser = new JFileChooser();
-            //FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
-            chooser.setCurrentDirectory(chooser.getCurrentDirectory());            
+            JFileChooser chooser = new JFileChooser();       
             chooser.setDialogTitle("Select Folder to Transform");
             chooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
             String path = this.target.getText();
diff --git a/enterprise/javaee.project/src/org/netbeans/modules/javaee/project/api/ant/ui/wizard/ProjectLocationPanel.java b/enterprise/javaee.project/src/org/netbeans/modules/javaee/project/api/ant/ui/wizard/ProjectLocationPanel.java
index 986baf151323..f3844ead8301 100644
--- a/enterprise/javaee.project/src/org/netbeans/modules/javaee/project/api/ant/ui/wizard/ProjectLocationPanel.java
+++ b/enterprise/javaee.project/src/org/netbeans/modules/javaee/project/api/ant/ui/wizard/ProjectLocationPanel.java
@@ -235,7 +235,6 @@ private void browseLocationAction(java.awt.event.ActionEvent evt) {//GEN-FIRST:e
         String command = evt.getActionCommand();        
         if ( "BROWSE".equals( command ) ) { // NOI18N                
             JFileChooser chooser = new JFileChooser ();
-            FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
             chooser.setDialogTitle(NbBundle.getMessage(ProjectLocationPanel.class,"LBL_NWP1_SelectProjectLocation"));
             chooser.setFileSelectionMode (JFileChooser.DIRECTORIES_ONLY);
             String path = this.projectLocationTextField.getText();
diff --git a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/CustomizerSupport.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/CustomizerSupport.java
index 3a79282efe16..2969711973e4 100644
--- a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/CustomizerSupport.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/CustomizerSupport.java
@@ -606,7 +606,6 @@ public void actionPerformed(ActionEvent e) {
 
         private void addPathElement () {
             JFileChooser chooser = new JFileChooser();
-            chooser.setCurrentDirectory(null);
             chooser.setMultiSelectionEnabled (true);
             String title = null;
             String message = null;
diff --git a/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/customizer/CustomizerSupport.java b/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/customizer/CustomizerSupport.java
index c38ff3e17f05..4aae6792599f 100644
--- a/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/customizer/CustomizerSupport.java
+++ b/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/customizer/CustomizerSupport.java
@@ -587,7 +587,6 @@ private void initComponents(PathModel model) {
 
         private void addPathElement () {
             JFileChooser chooser = new JFileChooser();
-            FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
             chooser.setMultiSelectionEnabled (true);
             String title = null;
             String message = null;
diff --git a/enterprise/web.freeform/src/org/netbeans/modules/web/freeform/ui/WebClasspathPanel.java b/enterprise/web.freeform/src/org/netbeans/modules/web/freeform/ui/WebClasspathPanel.java
index 64666a1c762b..7cf67309f4c8 100644
--- a/enterprise/web.freeform/src/org/netbeans/modules/web/freeform/ui/WebClasspathPanel.java
+++ b/enterprise/web.freeform/src/org/netbeans/modules/web/freeform/ui/WebClasspathPanel.java
@@ -305,20 +305,17 @@ private void removeClasspathActionPerformed(java.awt.event.ActionEvent evt) {//G
 
     private void addClasspathActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_addClasspathActionPerformed
         FileChooser chooser = new FileChooser(this.projectFolder, null);
-        FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
+        chooser.setCurrentDirectory(null);
         chooser.setFileSelectionMode (JFileChooser.FILES_AND_DIRECTORIES);
         chooser.setMultiSelectionEnabled(true);
         if (lastChosenFile != null) {
             chooser.setSelectedFile(lastChosenFile);
-        }
-        else {
-            if (projectFolder!= null) {
-                File files[] = projectFolder.listFiles();
-                if (files != null && files.length > 0) {
-                    chooser.setSelectedFile(files[0]);
-                } else {
-                    chooser.setSelectedFile(projectFolder);
-                }
+        } else if (projectFolder!= null) {
+            File[] files = projectFolder.listFiles();
+            if (files != null && files.length > 0) {
+                chooser.setSelectedFile(files[0]);
+            } else {
+                chooser.setSelectedFile(projectFolder);
             }
         }
         chooser.setDialogTitle(NbBundle.getMessage(WebClasspathPanel.class, "LBL_Browse_Classpath"));
diff --git a/enterprise/web.freeform/src/org/netbeans/modules/web/freeform/ui/WebLocationsPanel.java b/enterprise/web.freeform/src/org/netbeans/modules/web/freeform/ui/WebLocationsPanel.java
index 8e8abfa24a30..26c99384f0ec 100644
--- a/enterprise/web.freeform/src/org/netbeans/modules/web/freeform/ui/WebLocationsPanel.java
+++ b/enterprise/web.freeform/src/org/netbeans/modules/web/freeform/ui/WebLocationsPanel.java
@@ -320,7 +320,7 @@ private void jButtonWebActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FI
     private static JFileChooser createChooser(File webPagesLoc, WizardDescriptor wizardDescriptor) {
 	String path = webPagesLoc.getAbsolutePath();
         JFileChooser chooser = new JFileChooser();
-        FileUtil.preventFileChooserSymlinkTraversal(chooser, new File(path));
+        chooser.setCurrentDirectory(new File(path));
         chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
         chooser.setAcceptAllFileFilterUsed(false);
         
diff --git a/enterprise/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerSources.java b/enterprise/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerSources.java
index 78d25de8a7f9..2d249f57b7b1 100644
--- a/enterprise/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerSources.java
+++ b/enterprise/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerSources.java
@@ -528,7 +528,6 @@ private void includeExcludeButtonActionPerformed(java.awt.event.ActionEvent evt)
     
     private void updateFolder(JTextField textField) {
         JFileChooser chooser = new JFileChooser();
-        FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
         chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
         File fileName = new File(textField.getText());
         File folder = fileName.isAbsolute() ? fileName : new File(projectFld, fileName.getPath());
diff --git a/extide/gradle/src/org/netbeans/modules/gradle/newproject/GradleInitPanelVisual.java b/extide/gradle/src/org/netbeans/modules/gradle/newproject/GradleInitPanelVisual.java
index af9a859de853..1ea54359f89a 100644
--- a/extide/gradle/src/org/netbeans/modules/gradle/newproject/GradleInitPanelVisual.java
+++ b/extide/gradle/src/org/netbeans/modules/gradle/newproject/GradleInitPanelVisual.java
@@ -185,7 +185,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
     private void btBrowseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btBrowseActionPerformed
         if ("BROWSE".equals(evt.getActionCommand())) { //NOI18N
             JFileChooser chooser = new JFileChooser();
-            chooser.setCurrentDirectory(null);
             chooser.setDialogTitle(Bundle.TIT_Select_Project_Location());
             chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
             String path = tfLocation.getText();
diff --git a/extide/gradle/src/org/netbeans/modules/gradle/newproject/ProjectAttributesPanelVisual.java b/extide/gradle/src/org/netbeans/modules/gradle/newproject/ProjectAttributesPanelVisual.java
index 27bbc4f906eb..8f342e97f96b 100644
--- a/extide/gradle/src/org/netbeans/modules/gradle/newproject/ProjectAttributesPanelVisual.java
+++ b/extide/gradle/src/org/netbeans/modules/gradle/newproject/ProjectAttributesPanelVisual.java
@@ -252,7 +252,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
     private void btBrowseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btBrowseActionPerformed
         if ("BROWSE".equals(evt.getActionCommand())) { //NOI18N
             JFileChooser chooser = new JFileChooser();
-            chooser.setCurrentDirectory(null);
             chooser.setDialogTitle(Bundle.TIT_Select_Project_Location());
             chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
             String path = tfProjectLocation.getText();
diff --git a/groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/gjdemo/GroovyJavaDemoPanelVisual.java b/groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/gjdemo/GroovyJavaDemoPanelVisual.java
index a76e59d0ed4e..031e784da5a2 100644
--- a/groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/gjdemo/GroovyJavaDemoPanelVisual.java
+++ b/groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/gjdemo/GroovyJavaDemoPanelVisual.java
@@ -126,7 +126,6 @@ private void browseButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-
         String command = evt.getActionCommand();
         if ("BROWSE".equals(command)) {
             JFileChooser chooser = new JFileChooser();
-            FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
             chooser.setDialogTitle("Select Project Location");
             chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
             String path = this.projectLocationTextField.getText();
diff --git a/groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/nbprojectgen/NBProjectGeneratorsPanelVisual.java b/groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/nbprojectgen/NBProjectGeneratorsPanelVisual.java
index 2eeb9f725e7e..9386ba4ccee9 100644
--- a/groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/nbprojectgen/NBProjectGeneratorsPanelVisual.java
+++ b/groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/nbprojectgen/NBProjectGeneratorsPanelVisual.java
@@ -126,7 +126,6 @@ private void browseButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-
         String command = evt.getActionCommand();
         if ("BROWSE".equals(command)) {
             JFileChooser chooser = new JFileChooser();
-            FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
             chooser.setDialogTitle("Select Project Location");
             chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
             String path = this.projectLocationTextField.getText();
diff --git a/ide/db.mysql/src/org/netbeans/modules/db/mysql/ui/AdminPropertiesPanel.java b/ide/db.mysql/src/org/netbeans/modules/db/mysql/ui/AdminPropertiesPanel.java
index ef393d0123dc..7ee1451f48b2 100644
--- a/ide/db.mysql/src/org/netbeans/modules/db/mysql/ui/AdminPropertiesPanel.java
+++ b/ide/db.mysql/src/org/netbeans/modules/db/mysql/ui/AdminPropertiesPanel.java
@@ -164,7 +164,6 @@ public void setDialogDescriptor(DialogDescriptor desc) {
     private void chooseFile(JTextField txtField) {
         JFileChooser chooser = new JFileChooser();
         
-        chooser.setCurrentDirectory(null);
         chooser.setFileSelectionMode (JFileChooser.FILES_ONLY);
         
         String path = txtField.getText().trim();
diff --git a/ide/derby/src/org/netbeans/modules/derby/ui/DerbyPropertiesPanel.java b/ide/derby/src/org/netbeans/modules/derby/ui/DerbyPropertiesPanel.java
index 847893530181..d5903a62b420 100644
--- a/ide/derby/src/org/netbeans/modules/derby/ui/DerbyPropertiesPanel.java
+++ b/ide/derby/src/org/netbeans/modules/derby/ui/DerbyPropertiesPanel.java
@@ -305,7 +305,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
 
 private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
         JFileChooser chooser = new JFileChooser();
-        chooser.setCurrentDirectory(null);
         chooser.setFileSelectionMode (JFileChooser.DIRECTORIES_ONLY);
         String location = getInstallLocation();
         if (location.length() > 0) {
@@ -326,7 +325,6 @@ private void derbyInstallActionPerformed(java.awt.event.ActionEvent evt) {//GEN-
 
     private void browseButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_browseButtonActionPerformed
         JFileChooser chooser = new JFileChooser();
-        chooser.setCurrentDirectory(null);
         chooser.setFileSelectionMode (JFileChooser.DIRECTORIES_ONLY);
         String derbySystemHome = getDerbySystemHome();
         if (derbySystemHome.length() > 0) {
diff --git a/ide/diff/src/org/netbeans/modules/diff/PatchAction.java b/ide/diff/src/org/netbeans/modules/diff/PatchAction.java
index 762fc6b670d0..e8c91dfe240b 100644
--- a/ide/diff/src/org/netbeans/modules/diff/PatchAction.java
+++ b/ide/diff/src/org/netbeans/modules/diff/PatchAction.java
@@ -242,7 +242,7 @@ private File getPatchFor(FileObject fo) {
                 break;
             }
         }
-        FileUtil.preventFileChooserSymlinkTraversal(chooser, patchDir);
+        chooser.setCurrentDirectory(patchDir);
         chooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
         String title = NbBundle.getMessage(PatchAction.class,
             (fo.isData()) ? "TITLE_SelectPatchForFile"
diff --git a/ide/project.ant.ui/src/org/netbeans/modules/project/ant/ui/VariablePanel.java b/ide/project.ant.ui/src/org/netbeans/modules/project/ant/ui/VariablePanel.java
index 226a3d79e12b..b7e7ce662430 100644
--- a/ide/project.ant.ui/src/org/netbeans/modules/project/ant/ui/VariablePanel.java
+++ b/ide/project.ant.ui/src/org/netbeans/modules/project/ant/ui/VariablePanel.java
@@ -134,7 +134,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
 private void browseButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_browseButtonActionPerformed
     JFileChooser chooser = new JFileChooser();
     chooser.setFileHidingEnabled(false);
-    FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
     chooser.setFileSelectionMode (JFileChooser.DIRECTORIES_ONLY);
     chooser.setMultiSelectionEnabled(false);
     chooser.setDialogTitle(NbBundle.getBundle(VariablePanel.class).getString("MSG_Choose_Folder"));
diff --git a/ide/project.ant/src/org/netbeans/modules/project/ant/ProjectLibraryProvider.java b/ide/project.ant/src/org/netbeans/modules/project/ant/ProjectLibraryProvider.java
index 52581d38afad..e1880d7792b3 100644
--- a/ide/project.ant/src/org/netbeans/modules/project/ant/ProjectLibraryProvider.java
+++ b/ide/project.ant/src/org/netbeans/modules/project/ant/ProjectLibraryProvider.java
@@ -180,7 +180,7 @@ public Set<ProjectLibraryArea> getOpenAreas() {
     }
 
     public ProjectLibraryArea createArea() {
-        JFileChooser jfc = new JFileChooser();
+        JFileChooser jfc = new JFileChooser(); // XXX remember last-selected dir
         jfc.setApproveButtonText(NbBundle.getMessage(ProjectLibraryProvider.class, "ProjectLibraryProvider.open_or_create"));
         FileFilter filter = new FileFilter() {
             public boolean accept(File f) {
@@ -191,7 +191,6 @@ public String getDescription() {
             }
         };
         jfc.setFileFilter(filter);
-        FileUtil.preventFileChooserSymlinkTraversal(jfc, null); // XXX remember last-selected dir
         while (jfc.showOpenDialog(Utilities.findDialogParent()) == JFileChooser.APPROVE_OPTION) {
             File f = jfc.getSelectedFile();
             if (filter.accept(f)) {
diff --git a/ide/projectui/src/org/netbeans/modules/project/ui/ProjectChooserAccessory.java b/ide/projectui/src/org/netbeans/modules/project/ui/ProjectChooserAccessory.java
index 5e67e6194769..ae90a4d954c1 100644
--- a/ide/projectui/src/org/netbeans/modules/project/ui/ProjectChooserAccessory.java
+++ b/ide/projectui/src/org/netbeans/modules/project/ui/ProjectChooserAccessory.java
@@ -475,7 +475,7 @@ public static JFileChooser createProjectChooser( boolean defaultAccessory ) {
             }
         }
 
-        FileUtil.preventFileChooserSymlinkTraversal(chooser, currDir);
+        chooser.setCurrentDirectory(currDir);
         new ProjectFileView(chooser);
 
         return chooser;
diff --git a/java/ant.freeform/src/org/netbeans/modules/ant/freeform/ui/BasicProjectInfoPanel.java b/java/ant.freeform/src/org/netbeans/modules/ant/freeform/ui/BasicProjectInfoPanel.java
index acafd5e4d472..8a6c87ab84da 100644
--- a/java/ant.freeform/src/org/netbeans/modules/ant/freeform/ui/BasicProjectInfoPanel.java
+++ b/java/ant.freeform/src/org/netbeans/modules/ant/freeform/ui/BasicProjectInfoPanel.java
@@ -456,7 +456,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
 
     private void browseProjectLocationActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_browseProjectLocationActionPerformed
         JFileChooser chooser = new JFileChooser();
-        FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
         chooser.setFileSelectionMode (JFileChooser.DIRECTORIES_ONLY);
         if (projectLocation.getText().length() > 0 && getProjectLocation().exists()) {
             chooser.setSelectedFile(getProjectLocation());
@@ -472,7 +471,6 @@ private void browseProjectLocationActionPerformed(java.awt.event.ActionEvent evt
 
     private void browseProjectFolderActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_browseProjectFolderActionPerformed
         JFileChooser chooser = new JFileChooser();
-        FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
         chooser.setFileSelectionMode (JFileChooser.DIRECTORIES_ONLY);
         if (projectFolder.getText().length() > 0 && getProjectFolder().exists()) {
             chooser.setSelectedFile(getProjectFolder());
@@ -490,7 +488,6 @@ private void browseProjectFolderActionPerformed(java.awt.event.ActionEvent evt)
 
     private void browseAntScriptActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_browseAntScriptActionPerformed
         JFileChooser chooser = new JFileChooser();
-        FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
         chooser.setFileSelectionMode (JFileChooser.FILES_ONLY);
         if (antScript.getText().length() > 0 && getAntScript().exists()) {
             chooser.setSelectedFile(getAntScript());
diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/library/J2SEVolumeCustomizer.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/library/J2SEVolumeCustomizer.java
index d1eb61880784..6f8f5c3f0a1f 100644
--- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/library/J2SEVolumeCustomizer.java
+++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/library/J2SEVolumeCustomizer.java
@@ -295,7 +295,6 @@ else if (indices[0]  >= 1) {
     private void addResource(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_addResource
         // TODO add your handling code here:
         JFileChooser chooser = new JFileChooser();
-        FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
         chooser.setAcceptAllFileFilterUsed(false);
         if (this.volumeType.equals(PersistenceLibrarySupport.VOLUME_TYPE_CLASSPATH)) {
             chooser.setMultiSelectionEnabled (true);
diff --git a/java/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/LibrariesNode.java b/java/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/LibrariesNode.java
index d2508814f1de..7e1624fa5225 100644
--- a/java/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/LibrariesNode.java
+++ b/java/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/LibrariesNode.java
@@ -1763,7 +1763,7 @@ public void actionPerformed(ActionEvent e) {
             }
             chooser.enableVariableBasedSelection(true);
             chooser.setFileHidingEnabled(false);
-            FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
+            chooser.setCurrentDirectory(null);
             chooser.setFileSelectionMode( JFileChooser.FILES_AND_DIRECTORIES );
             chooser.setMultiSelectionEnabled( true );
             chooser.setDialogTitle( NbBundle.getMessage( LibrariesNode.class, "LBL_AddJar_DialogTitle" ) ); // NOI18N
diff --git a/java/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/EditMediator.java b/java/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/EditMediator.java
index 9e7b2c963fac..f05d3e1e5bf2 100644
--- a/java/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/EditMediator.java
+++ b/java/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/EditMediator.java
@@ -284,7 +284,6 @@ public void run() {
                             }
                             chooser.enableVariableBasedSelection(true);
                             chooser.setFileHidingEnabled(false);
-                            FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
                             chooser.setFileSelectionMode(fileSelectionMode);
                             chooser.setMultiSelectionEnabled( true );
                             chooser.setDialogTitle( NbBundle.getMessage( EditMediator.class, "LBL_AddJar_DialogTitle" ) ); // NOI18N
diff --git a/java/java.freeform/src/org/netbeans/modules/java/freeform/ui/ClasspathPanel.form b/java/java.freeform/src/org/netbeans/modules/java/freeform/ui/ClasspathPanel.form
index 1dfdadcdde41..d9a6b941a5b9 100644
--- a/java/java.freeform/src/org/netbeans/modules/java/freeform/ui/ClasspathPanel.form
+++ b/java/java.freeform/src/org/netbeans/modules/java/freeform/ui/ClasspathPanel.form
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 
 <!--
 
diff --git a/java/java.freeform/src/org/netbeans/modules/java/freeform/ui/ClasspathPanel.java b/java/java.freeform/src/org/netbeans/modules/java/freeform/ui/ClasspathPanel.java
index d83c3044c969..015cea2815bd 100644
--- a/java/java.freeform/src/org/netbeans/modules/java/freeform/ui/ClasspathPanel.java
+++ b/java/java.freeform/src/org/netbeans/modules/java/freeform/ui/ClasspathPanel.java
@@ -710,10 +710,7 @@ private void removeClasspathActionPerformed(java.awt.event.ActionEvent evt) {//G
     }//GEN-LAST:event_removeClasspathActionPerformed
 
     private void addClasspathActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_addClasspathActionPerformed
-        FileChooser chooser;
-        chooser = new FileChooser(model.getBaseFolder(), null);
-
-        FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
+        FileChooser chooser = new FileChooser(model.getBaseFolder(), null);
         chooser.setFileSelectionMode (JFileChooser.FILES_AND_DIRECTORIES);
         chooser.setMultiSelectionEnabled(true);
         chooser.setDialogTitle(NbBundle.getMessage(ClasspathPanel.class, "LBL_Browse_Classpath"));
diff --git a/java/java.freeform/src/org/netbeans/modules/java/freeform/ui/OutputPanel.java b/java/java.freeform/src/org/netbeans/modules/java/freeform/ui/OutputPanel.java
index 62bb66eaee13..58637f454c25 100644
--- a/java/java.freeform/src/org/netbeans/modules/java/freeform/ui/OutputPanel.java
+++ b/java/java.freeform/src/org/netbeans/modules/java/freeform/ui/OutputPanel.java
@@ -350,7 +350,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
 
     private void javadocBrowseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_javadocBrowseActionPerformed
         JFileChooser chooser = new JFileChooser();
-        FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
         chooser.setFileSelectionMode (JFileChooser.FILES_AND_DIRECTORIES);
         chooser.setMultiSelectionEnabled(false);
         if (lastChosenFile != null) {
@@ -529,7 +528,6 @@ private void removeOutputActionPerformed(java.awt.event.ActionEvent evt) {//GEN-
 
     private void addOutputActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_addOutputActionPerformed
         JFileChooser chooser = new JFileChooser();
-        FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
         chooser.setFileSelectionMode (JFileChooser.FILES_AND_DIRECTORIES);
         chooser.setMultiSelectionEnabled(true);
         if (lastChosenFile != null) {
diff --git a/java/java.j2semodule/src/org/netbeans/modules/java/j2semodule/ui/customizer/CustomizerRun.java b/java/java.j2semodule/src/org/netbeans/modules/java/j2semodule/ui/customizer/CustomizerRun.java
index f78d114b90e1..767298c4ce96 100644
--- a/java/java.j2semodule/src/org/netbeans/modules/java/j2semodule/ui/customizer/CustomizerRun.java
+++ b/java/java.j2semodule/src/org/netbeans/modules/java/j2semodule/ui/customizer/CustomizerRun.java
@@ -575,7 +575,6 @@ private void configComboActionPerformed(java.awt.event.ActionEvent evt) {//GEN-F
 
     private void jButtonWorkingDirectoryBrowseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButtonWorkingDirectoryBrowseActionPerformed
         JFileChooser chooser = new JFileChooser();
-        FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
         chooser.setFileSelectionMode (JFileChooser.DIRECTORIES_ONLY);
         chooser.setMultiSelectionEnabled(false);
         
diff --git a/java/java.j2semodule/src/org/netbeans/modules/java/j2semodule/ui/wizards/PanelProjectLocationVisual.java b/java/java.j2semodule/src/org/netbeans/modules/java/j2semodule/ui/wizards/PanelProjectLocationVisual.java
index a47e2a6893c0..612a3a8ca466 100644
--- a/java/java.j2semodule/src/org/netbeans/modules/java/j2semodule/ui/wizards/PanelProjectLocationVisual.java
+++ b/java/java.j2semodule/src/org/netbeans/modules/java/j2semodule/ui/wizards/PanelProjectLocationVisual.java
@@ -165,7 +165,6 @@ private void browseLocationAction(java.awt.event.ActionEvent evt) {//GEN-FIRST:e
         String command = evt.getActionCommand();        
         if ( "BROWSE".equals( command ) ) { // NOI18N                
             JFileChooser chooser = new JFileChooser ();
-            FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
             chooser.setDialogTitle(NbBundle.getMessage(PanelProjectLocationVisual.class,"LBL_NWP1_SelectProjectLocation"));
             chooser.setFileSelectionMode (JFileChooser.DIRECTORIES_ONLY);
             String path = this.projectLocationTextField.getText();
@@ -311,7 +310,6 @@ void validate (WizardDescriptor d) throws WizardValidationException {
     
     private static JFileChooser createChooser() {
         JFileChooser chooser = new JFileChooser();
-        FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
         chooser.setFileSelectionMode( JFileChooser.DIRECTORIES_ONLY );
         chooser.setAcceptAllFileFilterUsed( false );
         chooser.setName( "Select Project Directory" ); // XXX // NOI18N
diff --git a/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/wizard/DetectPanel.java b/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/wizard/DetectPanel.java
index 2ff3bce6e2e6..5bce622dcfba 100644
--- a/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/wizard/DetectPanel.java
+++ b/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/wizard/DetectPanel.java
@@ -355,7 +355,6 @@ private static String getInitialName (Map<String,String> m) {
     
     private String browse (String oldValue, String title) {
         JFileChooser chooser = new JFileChooser ();
-        FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
         chooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
         if (Utilities.isMac()) {
             //New JDKs and JREs are bundled into package, allow JFileChooser to navigate in
diff --git a/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerRun.java b/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerRun.java
index 3bc2e2a2f02b..19b2da0c6070 100644
--- a/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerRun.java
+++ b/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerRun.java
@@ -582,7 +582,6 @@ private void configComboActionPerformed(java.awt.event.ActionEvent evt) {//GEN-F
 
     private void jButtonWorkingDirectoryBrowseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButtonWorkingDirectoryBrowseActionPerformed
         JFileChooser chooser = new JFileChooser();
-        FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
         chooser.setFileSelectionMode (JFileChooser.DIRECTORIES_ONLY);
         chooser.setMultiSelectionEnabled(false);
         
diff --git a/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/wizards/PanelProjectLocationExtSrc.java b/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/wizards/PanelProjectLocationExtSrc.java
index 4e15471f77e4..b2451bafb7b5 100644
--- a/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/wizards/PanelProjectLocationExtSrc.java
+++ b/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/wizards/PanelProjectLocationExtSrc.java
@@ -451,7 +451,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
     private void browseProjectLocation(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_browseProjectLocation
         // TODO add your handling code here:
         JFileChooser chooser = new JFileChooser();
-        FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
         chooser.setDialogTitle(NbBundle.getMessage(PanelSourceFolders.class,"LBL_NWP1_SelectProjectLocation"));
         chooser.setFileSelectionMode (JFileChooser.DIRECTORIES_ONLY);
         String path = this.projectLocation.getText();
diff --git a/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/wizards/PanelProjectLocationVisual.java b/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/wizards/PanelProjectLocationVisual.java
index b86c70ab6f74..8c8c208a7be5 100644
--- a/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/wizards/PanelProjectLocationVisual.java
+++ b/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/wizards/PanelProjectLocationVisual.java
@@ -167,7 +167,6 @@ private void browseLocationAction(java.awt.event.ActionEvent evt) {//GEN-FIRST:e
         String command = evt.getActionCommand();        
         if ( "BROWSE".equals( command ) ) { // NOI18N                
             JFileChooser chooser = new JFileChooser ();
-            FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
             chooser.setDialogTitle(NbBundle.getMessage(PanelSourceFolders.class,"LBL_NWP1_SelectProjectLocation"));
             chooser.setFileSelectionMode (JFileChooser.DIRECTORIES_ONLY);
             String path = this.projectLocationTextField.getText();
@@ -324,7 +323,6 @@ void validate (WizardDescriptor d) throws WizardValidationException {
     
     private static JFileChooser createChooser() {
         JFileChooser chooser = new JFileChooser();
-        FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
         chooser.setFileSelectionMode( JFileChooser.DIRECTORIES_ONLY );
         chooser.setAcceptAllFileFilterUsed( false );
         chooser.setName( "Select Project Directory" ); // XXX // NOI18N
diff --git a/java/java.project.ui/src/org/netbeans/spi/java/project/support/ui/EditJarPanel.java b/java/java.project.ui/src/org/netbeans/spi/java/project/support/ui/EditJarPanel.java
index 4b56fbcd39be..264b541b2c8f 100644
--- a/java/java.project.ui/src/org/netbeans/spi/java/project/support/ui/EditJarPanel.java
+++ b/java/java.project.ui/src/org/netbeans/spi/java/project/support/ui/EditJarPanel.java
@@ -279,7 +279,6 @@ private void btnJavadocActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FI
         }
         chooser.enableVariableBasedSelection(true);
         chooser.setFileHidingEnabled(false);
-        FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
         chooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
         chooser.setMultiSelectionEnabled(false);
         chooser.setDialogTitle(LBL_Edit_Jar_Panel_browse());
@@ -315,7 +314,7 @@ private void btnSourceActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR
         }
         chooser.enableVariableBasedSelection(true);
         chooser.setFileHidingEnabled(false);
-        FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
+        chooser.setCurrentDirectory(null);
         chooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
         chooser.setMultiSelectionEnabled(false);
         chooser.setDialogTitle(LBL_Edit_Jar_Panel_browse());
diff --git a/java/javawebstart/src/org/netbeans/modules/javawebstart/ui/customizer/JWSCustomizerPanel.java b/java/javawebstart/src/org/netbeans/modules/javawebstart/ui/customizer/JWSCustomizerPanel.java
index cc2c29ac85ed..891aaa1754c5 100644
--- a/java/javawebstart/src/org/netbeans/modules/javawebstart/ui/customizer/JWSCustomizerPanel.java
+++ b/java/javawebstart/src/org/netbeans/modules/javawebstart/ui/customizer/JWSCustomizerPanel.java
@@ -476,7 +476,6 @@ private void enableCheckBoxActionPerformed(java.awt.event.ActionEvent evt) {//GE
 
     private void browseButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_browseButtonActionPerformed
         JFileChooser chooser = new JFileChooser();
-        FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
         chooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
         chooser.setMultiSelectionEnabled(false);
         chooser.setFileFilter(new IconFileFilter());
diff --git a/java/maven/src/org/netbeans/modules/maven/customizer/RunJarPanel.java b/java/maven/src/org/netbeans/modules/maven/customizer/RunJarPanel.java
index 95ff7dac1805..a33ba758a7ca 100644
--- a/java/maven/src/org/netbeans/modules/maven/customizer/RunJarPanel.java
+++ b/java/maven/src/org/netbeans/modules/maven/customizer/RunJarPanel.java
@@ -439,7 +439,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
 
     private void btnWorkDirActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnWorkDirActionPerformed
         JFileChooser chooser = new JFileChooser();
-        chooser.setCurrentDirectory(null);
         chooser.setFileSelectionMode (JFileChooser.DIRECTORIES_ONLY);
         chooser.setMultiSelectionEnabled(false);
         
diff --git a/java/maven/src/org/netbeans/modules/maven/newproject/BasicPanelVisual.java b/java/maven/src/org/netbeans/modules/maven/newproject/BasicPanelVisual.java
index 0a46d09cbd11..781c1639a006 100644
--- a/java/maven/src/org/netbeans/modules/maven/newproject/BasicPanelVisual.java
+++ b/java/maven/src/org/netbeans/modules/maven/newproject/BasicPanelVisual.java
@@ -426,7 +426,6 @@ private void browseButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-
         String command = evt.getActionCommand();
         if ("BROWSE".equals(command)) { //NOI18N
             JFileChooser chooser = new JFileChooser();
-            chooser.setCurrentDirectory(null);
             chooser.setDialogTitle(TIT_Select_Project_Location());
             chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
             String path = this.projectLocationTextField.getText();
diff --git a/java/projectimport.eclipse.core/src/org/netbeans/modules/projectimport/eclipse/core/UpdateEclipseReferencePanel.java b/java/projectimport.eclipse.core/src/org/netbeans/modules/projectimport/eclipse/core/UpdateEclipseReferencePanel.java
index 6ffdf6887505..565a98923660 100644
--- a/java/projectimport.eclipse.core/src/org/netbeans/modules/projectimport/eclipse/core/UpdateEclipseReferencePanel.java
+++ b/java/projectimport.eclipse.core/src/org/netbeans/modules/projectimport/eclipse/core/UpdateEclipseReferencePanel.java
@@ -233,7 +233,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
 
 private void browseProjectButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_browseProjectButtonActionPerformed
     JFileChooser chooser = new JFileChooser();
-    FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
     chooser.setFileSelectionMode (JFileChooser.DIRECTORIES_ONLY);
     chooser.setMultiSelectionEnabled(false);
     chooser.setDialogTitle(org.openide.util.NbBundle.getMessage(UpdateEclipseReferencePanel.class, "TITLE_Select_Eclipse_Project"));
@@ -245,7 +244,6 @@ private void browseProjectButtonActionPerformed(java.awt.event.ActionEvent evt)
 
 private void browseWorkspaceButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_browseWorkspaceButtonActionPerformed
     JFileChooser chooser = new JFileChooser();
-    FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
     chooser.setFileSelectionMode (JFileChooser.DIRECTORIES_ONLY);
     chooser.setMultiSelectionEnabled(false);
     chooser.setDialogTitle(org.openide.util.NbBundle.getMessage(UpdateEclipseReferencePanel.class, "TITLE_Select_Eclipse_Workspace"));
diff --git a/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/ui/JFXIconsPanel.java b/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/ui/JFXIconsPanel.java
index 57ffb65bcf78..388d2ad0d9b1 100644
--- a/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/ui/JFXIconsPanel.java
+++ b/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/ui/JFXIconsPanel.java
@@ -275,7 +275,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
 
     private void wsIconButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_wsIconButtonActionPerformed
         JFileChooser chooser = new JFileChooser();
-        chooser.setCurrentDirectory(null);
         chooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
         chooser.setMultiSelectionEnabled(false);
         chooser.setFileFilter(new IconFileFilter(true));
@@ -300,7 +299,6 @@ private void wsIconButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-
 
     private void splashButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_splashButtonActionPerformed
         JFileChooser chooser = new JFileChooser();
-        chooser.setCurrentDirectory(null);
         chooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
         chooser.setMultiSelectionEnabled(false);
         chooser.setFileFilter(new IconFileFilter(false));
@@ -325,7 +323,6 @@ private void splashButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-
 
     private void nativeIconButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_nativeIconButtonActionPerformed
         JFileChooser chooser = new JFileChooser();
-        chooser.setCurrentDirectory(null);
         chooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
         chooser.setMultiSelectionEnabled(false);
         chooser.setFileFilter(new IconFileFilter(false));
diff --git a/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/ui/JFXRunPanel.java b/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/ui/JFXRunPanel.java
index a6a5784a54c3..7e3c892b895b 100644
--- a/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/ui/JFXRunPanel.java
+++ b/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/ui/JFXRunPanel.java
@@ -1011,7 +1011,6 @@ private void buttonNewActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR
 
 private void buttonWorkDirActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonWorkDirActionPerformed
         JFileChooser chooser = new JFileChooser();
-        chooser.setCurrentDirectory(null);
         chooser.setFileSelectionMode (JFileChooser.DIRECTORIES_ONLY);
         chooser.setMultiSelectionEnabled(false);
         
@@ -1154,7 +1153,6 @@ private void showFXSpecificOptions(boolean visible) {
 
 private void buttonWebPageActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonWebPageActionPerformed
     JFileChooser chooser = new JFileChooser();
-    chooser.setCurrentDirectory(null);
     chooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
     chooser.setMultiSelectionEnabled(false);
     chooser.setFileFilter(new HtmlFileFilter());
diff --git a/platform/openide.filesystems.nb/src/org/openide/filesystems/FileChooserBuilder.java b/platform/openide.filesystems.nb/src/org/openide/filesystems/FileChooserBuilder.java
index dc4eea30adc2..66c2a484b856 100644
--- a/platform/openide.filesystems.nb/src/org/openide/filesystems/FileChooserBuilder.java
+++ b/platform/openide.filesystems.nb/src/org/openide/filesystems/FileChooserBuilder.java
@@ -85,9 +85,6 @@ public class FileChooserBuilder {
     private BadgeProvider badger;
     private String title;
     private String approveText;
-    //Just in case...
-    private static boolean PREVENT_SYMLINK_TRAVERSAL =
-            !Boolean.getBoolean("allow.filechooser.symlink.traversal"); //NOI18N
     private final String dirKey;
     private File failoverDir;
     private FileFilter filter;
@@ -392,10 +389,6 @@ private void prepareFileChooser(JFileChooser chooser) {
             chooser.setFileView(new CustomFileView(new BadgeIconProvider(badger),
                     chooser.getFileSystemView()));
         }
-        if (PREVENT_SYMLINK_TRAVERSAL) {
-            FileUtil.preventFileChooserSymlinkTraversal(chooser,
-                    chooser.getCurrentDirectory());
-        }
         if (filter != null) {
             chooser.setFileFilter(filter);
         }
diff --git a/platform/openide.filesystems/src/org/openide/filesystems/FileUtil.java b/platform/openide.filesystems/src/org/openide/filesystems/FileUtil.java
index 7e8924d6194a..1638b7e066ac 100644
--- a/platform/openide.filesystems/src/org/openide/filesystems/FileUtil.java
+++ b/platform/openide.filesystems/src/org/openide/filesystems/FileUtil.java
@@ -2138,7 +2138,7 @@ public static File archiveOrDirForURL(URL entry) {
      * @since org.openide/1 4.42
      * @deprecated Just use {@link javax.swing.JFileChooser#setCurrentDirectory}. JDK 6 does not have this bug.
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     public static void preventFileChooserSymlinkTraversal(javax.swing.JFileChooser chooser, File currentDirectory) {
         chooser.setCurrentDirectory(currentDirectory);
     }
diff --git a/platform/openide.loaders/src/org/openide/actions/SaveAsAction.java b/platform/openide.loaders/src/org/openide/actions/SaveAsAction.java
index 1e7f4e9de539..8fcb602281da 100644
--- a/platform/openide.loaders/src/org/openide/actions/SaveAsAction.java
+++ b/platform/openide.loaders/src/org/openide/actions/SaveAsAction.java
@@ -154,7 +154,7 @@ private File getNewFileName() {
         chooser.setMultiSelectionEnabled( false );
         if( null != newFile ) {
             chooser.setSelectedFile( newFile );
-            FileUtil.preventFileChooserSymlinkTraversal( chooser, newFile.getParentFile() );
+            chooser.setCurrentDirectory(newFile.getParentFile());
         }
         File initialFolder = getInitialFolderFrom( newFile );
         if( null != initialFolder )
diff --git a/rust/rust.project/src/org/netbeans/modules/rust/project/templates/RustProjectTemplatePanelVisual.java b/rust/rust.project/src/org/netbeans/modules/rust/project/templates/RustProjectTemplatePanelVisual.java
index 1e2ac2c46a24..fc29ee896f81 100644
--- a/rust/rust.project/src/org/netbeans/modules/rust/project/templates/RustProjectTemplatePanelVisual.java
+++ b/rust/rust.project/src/org/netbeans/modules/rust/project/templates/RustProjectTemplatePanelVisual.java
@@ -149,7 +149,6 @@ private void browseButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-
         String command = evt.getActionCommand();
         if ("BROWSE".equals(command)) {
             JFileChooser chooser = new JFileChooser();
-            FileUtil.preventFileChooserSymlinkTraversal(chooser, null);
             chooser.setDialogTitle("Select Project Location");
             chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
             String path = this.projectLocationTextField.getText();