2.2.14 - revert to old right-click handling