diff --git a/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/RosJavaPlugin.groovy b/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/RosJavaPlugin.groovy
index 9d9382915dbe5d1b694469543e35b748c35948ed..d7a8c99c61ad2dbe3d574a31bd4a1fa1ea2d81f6 100644
--- a/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/RosJavaPlugin.groovy
+++ b/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/RosJavaPlugin.groovy
@@ -16,9 +16,11 @@ class RosJavaPlugin implements Plugin<Project> {
         if (!project.plugins.findPlugin('java')) {
             project.apply(plugin: 'java')
         }
+        /* Disabling for now - may be source of build farm problems
         if (!project.plugins.findPlugin('osgi')) {
             project.apply(plugin: 'osgi')
         }
+        */
         
         project.sourceCompatibility = 1.6
         project.targetCompatibility = 1.6