diff --git a/core/flyout.js b/core/flyout.js
index 8f52b10c3..199a34bfb 100644
--- a/core/flyout.js
+++ b/core/flyout.js
@@ -845,13 +845,13 @@ Blockly.Flyout.prototype.addBlockListeners_ = function(root, block, rect) {
       this.blockMouseDown_(block)));
   this.listeners_.push(Blockly.bindEventWithChecks_(rect, 'mousedown', null,
       this.blockMouseDown_(block)));
-  this.listeners_.push(Blockly.bindEventWithChecks_(root, 'mouseover', block,
+  this.listeners_.push(Blockly.bindEvent_(root, 'mouseover', block,
       block.addSelect));
-  this.listeners_.push(Blockly.bindEventWithChecks_(root, 'mouseout', block,
+  this.listeners_.push(Blockly.bindEvent_(root, 'mouseout', block,
       block.removeSelect));
-  this.listeners_.push(Blockly.bindEventWithChecks_(rect, 'mouseover', block,
+  this.listeners_.push(Blockly.bindEvent_(rect, 'mouseover', block,
       block.addSelect));
-  this.listeners_.push(Blockly.bindEventWithChecks_(rect, 'mouseout', block,
+  this.listeners_.push(Blockly.bindEvent_(rect, 'mouseout', block,
       block.removeSelect));
 };
 
diff --git a/core/tooltip.js b/core/tooltip.js
index 447907273..e8990595d 100644
--- a/core/tooltip.js
+++ b/core/tooltip.js
@@ -131,9 +131,9 @@ Blockly.Tooltip.createDom = function() {
  * @param {!Element} element SVG element onto which tooltip is to be bound.
  */
 Blockly.Tooltip.bindMouseEvents = function(element) {
-  Blockly.bindEventWithChecks_(element, 'mouseover', null,
+  Blockly.bindEvent_(element, 'mouseover', null,
       Blockly.Tooltip.onMouseOver_);
-  Blockly.bindEventWithChecks_(element, 'mouseout', null,
+  Blockly.bindEvent_(element, 'mouseout', null,
       Blockly.Tooltip.onMouseOut_);
 
   // Don't use bindEvent_ for mousemove since that would create a