Revert "Merge pull request #2577 from machty/bubbling-controller-events"

This reverts commit 05686ccce26808da4a1e1247b131c68cfba15486, reversing
changes made to 7387d6723b5a20395dfd041a67633a6101c2259d.
Merge pull request #2639 from machty/revert-controller-bubbling-actions

Revert "Merge pull request #2577 from machty/bubbling-controller-events"