diff --git a/docs/framework-riverbed_appinternals_agent.md b/docs/framework-riverbed_appinternals_agent.md
index 2171d737e..f0012a01f 100644
--- a/docs/framework-riverbed_appinternals_agent.md
+++ b/docs/framework-riverbed_appinternals_agent.md
@@ -52,3 +52,7 @@ The framework can be configured by modifying the [`config/riverbed_appinternals_
 **NOTE**
 
 If the Riverbed Service Broker's version is greater than or equal to 10.20, the buildpack will instead download Riverbed AppInternals agent from Riverbed Service Broker and will fall back to using `repository_root` in [`config/riverbed_appinternals_agent.yml`][] only if Service Broker failed to serve the Agent artifact.
+
+**NOTE**
+
+If the Rivered verstion is 10.21.9 or later, the buildpack will load the profiler normally, instead of from the Service Broker. This allows for creating multiple offline buildpacks containing different versions.
diff --git a/lib/java_buildpack/framework/riverbed_appinternals_agent.rb b/lib/java_buildpack/framework/riverbed_appinternals_agent.rb
index f8e832f45..21d42a150 100644
--- a/lib/java_buildpack/framework/riverbed_appinternals_agent.rb
+++ b/lib/java_buildpack/framework/riverbed_appinternals_agent.rb
@@ -29,19 +29,19 @@ class RiverbedAppinternalsAgent < JavaBuildpack::Component::VersionedDependencyC
       # @param [Hash] context a collection of utilities used the component
       def initialize(context)
         super(context)
-        @uri = download_url(credentials, @uri)
+###        @uri = download_url(credentials, @uri)
       end
 
       # (see JavaBuildpack::Component::BaseComponent#compile)
       def compile
-        JavaBuildpack::Util::Cache::InternetAvailability.instance.available(
-          true, 'Downloading from Riverbed AppInternals Service Broker'
-        ) do
+###        JavaBuildpack::Util::Cache::InternetAvailability.instance.available(
+###          true, 'Downloading from Riverbed AppInternals Service Broker'
+###        ) do
           download_zip(false, @droplet.sandbox, @component_name)
-        end
+###        end
         @droplet.copy_resources
-      rescue StandardError => e
-        raise "Riverbed AppInternals download failed: #{e}"
+###      rescue StandardError => e
+###        raise "Riverbed AppInternals download failed: #{e}"
       end
 
       # (see JavaBuildpack::Component::BaseComponent#release)
@@ -107,9 +107,9 @@ def rvbd_moniker(credentials)
         credentials['rvbd_moniker'] || @configuration['rvbd_moniker']
       end
 
-      def download_url(credentials, default_url)
-        (credentials[PROFILERURL] unless credentials.nil?) || default_url
-      end
+###      def download_url(credentials, default_url)
+###        (credentials[PROFILERURL] unless credentials.nil?) || default_url
+###      end
 
     end
   end
diff --git a/spec/java_buildpack/framework/riverbed_appinternals_agent_spec.rb b/spec/java_buildpack/framework/riverbed_appinternals_agent_spec.rb
index 3b03bf076..af77ded8e 100644
--- a/spec/java_buildpack/framework/riverbed_appinternals_agent_spec.rb
+++ b/spec/java_buildpack/framework/riverbed_appinternals_agent_spec.rb
@@ -31,8 +31,8 @@
     before do
       allow(services).to receive(:one_service?).with(/appinternals/).and_return(true)
 
-      allow(services).to receive(:find_service).and_return('credentials' => { 'profilerUrlLinux' =>
-                                                                                'http://testfoobar/profiler.zip' })
+###      allow(services).to receive(:find_service).and_return('credentials' => { 'profilerUrlLinux' =>
+###                                                                                'http://testfoobar/profiler.zip' })
 
       allow(application_cache).to receive(:get).with('http://testfoobar/profiler.zip')
                                                .and_yield(Pathname.new('spec/fixtures/'\