I merged this change without checking it properly. On Chrome I'm getting exceptions thrown here
```
Uncaught ReferenceError: $_data is not defined
startHandler
x.event.dispatch jquery.js:4597
x.event.add.y.handle jquery.js:4281
```