diff --git a/core/src/main/java/hudson/model/Hudson.java b/core/src/main/java/hudson/model/Hudson.java
index 30a437e0b55faec7ebc944610d0ba103119dea98..49d2dacdbb3963927bd05aadc73ee7841491f7b5 100644
--- a/core/src/main/java/hudson/model/Hudson.java
+++ b/core/src/main/java/hudson/model/Hudson.java
@@ -332,7 +332,9 @@ public final class Hudson extends View implements ItemGroup<TopLevelItem>, Node
      * Gets the {@link JobPropertyDescriptor} by name. Primarily used for making them web-visible.
      */
     public JobPropertyDescriptor getJobProperty(String shortClassName) {
-        return (JobPropertyDescriptor)findDescriptor(shortClassName, Jobs.PROPERTIES);
+        // combining these two lines triggers javac bug. See issue #610.
+        Descriptor d = findDescriptor(shortClassName, Jobs.PROPERTIES);
+        return (JobPropertyDescriptor) d;
     }
 
     /**