Revert "fixes to last commit"

This reverts commit dfc72ff8eeb1b4564f7a31054465a65e5e95da56.
Revert "don't handle mouse NOOP actions as mouse actions"

This reverts commit b9be581c354dfcc6456cc1e846379b7e1b953a71.