diff --git a/docker/blocks/collectd/fig b/docker/blocks/collectd/fig
index 6c2e7e25893..e0ec592b189 100644
--- a/docker/blocks/collectd/fig
+++ b/docker/blocks/collectd/fig
@@ -9,4 +9,4 @@ collectd:
     COLLECT_INTERVAL: 10
   links:
     - graphite
-    - memcached
+    # - memcached
diff --git a/public/app/plugins/panel/graph/jquery.flot.events.js b/public/app/plugins/panel/graph/jquery.flot.events.js
index bf3b4b26eb3..60b6acd1518 100644
--- a/public/app/plugins/panel/graph/jquery.flot.events.js
+++ b/public/app/plugins/panel/graph/jquery.flot.events.js
@@ -365,12 +365,20 @@ function ($, _, angular, Drop) {
 
     plot.hooks.draw.push(function(plot) {
       var options = plot.getOptions();
+      var container = plot.getPlaceholder();
+      var containerElem = container[0];
+
+      if (containerElem.removeEventsElements) {
+        container.find(".events_line").remove();
+        containerElem.removeEventsElements = false;
+      }
 
       if (eventMarkers.eventsEnabled) {
         // check for first run
         if (eventMarkers.getEvents().length < 1) {
           eventMarkers.setTypes(options.events.types);
           eventMarkers.setupEvents(options.events.data);
+          containerElem.removeEventsElements = true;
         } else {
           eventMarkers.updateEvents();
         }
diff --git a/public/vendor/flot/jquery.flot.js b/public/vendor/flot/jquery.flot.js
index e2c460ddbd0..45d76b440c3 100644
--- a/public/vendor/flot/jquery.flot.js
+++ b/public/vendor/flot/jquery.flot.js
@@ -1316,14 +1316,10 @@ Licensed under the MIT license.
         }
 
         function setupCanvases() {
-
             // Make sure the placeholder is clear of everything except canvases
             // from a previous plot in this container that we'll try to re-use.
 
-            placeholder.css("padding", 0) // padding messes up the positioning
-                .children().filter(function(){
-                    return $(this).hasClass("flot-text");
-                }).remove();
+            placeholder.find(".flot-text").remove();
 
             if (placeholder.css("position") == 'static')
                 placeholder.css("position", "relative"); // for positioning labels and overlay