diff --git a/core/src/main/java/hudson/model/Cause.java b/core/src/main/java/hudson/model/Cause.java
index 0816a828445a474c73bfeac9a552941bb33fb000..545af0ba16c0e62573110122d4775b0620b327ad 100644
--- a/core/src/main/java/hudson/model/Cause.java
+++ b/core/src/main/java/hudson/model/Cause.java
@@ -33,10 +33,11 @@ import org.kohsuke.stapler.export.ExportedBean;
  *
  * @author Michael Donohue
  */
+@ExportedBean
 public abstract class Cause {
+	@Exported(visibility=3)
 	abstract public String getShortDescription();
 	
-	@ExportedBean
 	public static class LegacyCodeCause extends Cause {
 		private StackTraceElement [] stackTrace;
 		public LegacyCodeCause() {
@@ -44,13 +45,11 @@ public abstract class Cause {
 		}
 		
 		@Override
-		@Exported
 		public String getShortDescription() {
 			return Messages.Cause_LegacyCodeCause_ShortDescription();
 		}
 	}
 	
-	@ExportedBean
 	public static class UpstreamCause extends Cause {
 		private String upstreamProject;
 		private int upstreamBuild;
@@ -64,13 +63,11 @@ public abstract class Cause {
 		}
 		
 		@Override
-		@Exported
 		public String getShortDescription() {
 			return Messages.Cause_UpstreamCause_ShortDescription(upstreamProject, upstreamBuild);
 		}
 	}
 
-	@ExportedBean
 	public static class UserCause extends Cause {
 		private String authenticationName;
 		public UserCause() {
@@ -78,7 +75,6 @@ public abstract class Cause {
 		}
 		
 		@Override
-		@Exported
 		public String getShortDescription() {
 			return Messages.Cause_UserCause_ShortDescription(authenticationName);
 		}
diff --git a/core/src/main/java/hudson/model/CauseAction.java b/core/src/main/java/hudson/model/CauseAction.java
index 676682449cefe5e21f8940fa715a35a6a2174289..5100de90ed20279bb0ddfe1bfc8a168d1fa45d2d 100644
--- a/core/src/main/java/hudson/model/CauseAction.java
+++ b/core/src/main/java/hudson/model/CauseAction.java
@@ -23,8 +23,14 @@
  */
 package hudson.model;
 
+import org.kohsuke.stapler.export.Exported;
+import org.kohsuke.stapler.export.ExportedBean;
+
+@ExportedBean
 public class CauseAction implements Action {
 	private Cause cause;
+
+	@Exported(visibility=2)
 	public Cause getCause() {
 		return cause;
 	}
diff --git a/core/src/main/java/hudson/triggers/SCMTrigger.java b/core/src/main/java/hudson/triggers/SCMTrigger.java
index d7fef7423451776960f2a73654bb39712b5c8a5d..6f625d0b5a95626a415ac799b872a55c56a8d852 100644
--- a/core/src/main/java/hudson/triggers/SCMTrigger.java
+++ b/core/src/main/java/hudson/triggers/SCMTrigger.java
@@ -37,8 +37,6 @@ import hudson.util.StreamTaskListener;
 import hudson.util.TimeUnit2;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.export.Exported;
-import org.kohsuke.stapler.export.ExportedBean;
 
 import java.io.File;
 import java.io.IOException;
@@ -455,15 +453,11 @@ public class SCMTrigger extends Trigger<SCMedItem> {
         }
     }
 
-    @ExportedBean
     public static class SCMTriggerCause extends Cause {
-
-    	@Override
-    	@Exported
-    	public String getShortDescription() {
-			return Messages.SCMTrigger_SCMTriggerCause_ShortDescription();
-    	}
-
+        @Override
+        public String getShortDescription() {
+            return Messages.SCMTrigger_SCMTriggerCause_ShortDescription();
+        }
     }
 
     /**
diff --git a/core/src/main/java/hudson/triggers/TimerTrigger.java b/core/src/main/java/hudson/triggers/TimerTrigger.java
index 0a26c60c8dc86031fbea0c35fffc6c425a3ae37a..e52d6506163b3a62c4a30fabe963b6a10beccbff 100644
--- a/core/src/main/java/hudson/triggers/TimerTrigger.java
+++ b/core/src/main/java/hudson/triggers/TimerTrigger.java
@@ -37,8 +37,6 @@ import javax.servlet.ServletException;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
-import org.kohsuke.stapler.export.Exported;
-import org.kohsuke.stapler.export.ExportedBean;
 
 import antlr.ANTLRException;
 
@@ -48,9 +46,9 @@ import antlr.ANTLRException;
  * @author Kohsuke Kawaguchi
  */
 public class TimerTrigger extends Trigger<BuildableItem> {
-	
-	@DataBoundConstructor
-	public TimerTrigger(String timer_spec) throws ANTLRException {
+
+    @DataBoundConstructor
+    public TimerTrigger(String timer_spec) throws ANTLRException {
         super(timer_spec);
     }
 
@@ -99,14 +97,10 @@ public class TimerTrigger extends Trigger<BuildableItem> {
         }
     }
     
-    @ExportedBean
     public static class TimerTriggerCause extends Cause {
-
-    	@Override
-    	@Exported
-		public String getShortDescription() {
-			return Messages.TimerTrigger_TimerTriggerCause_ShortDescription();
-    	}
-
+        @Override
+        public String getShortDescription() {
+            return Messages.TimerTrigger_TimerTriggerCause_ShortDescription();
+        }
     }
 }