scoped-mousetrap
Revert "scoped-mousetrap"

This reverts commit acb60de923102072fa296d9a116cd5867a18f09d.
Merge remote-tracking branch 'origin/0-1-a1' into 0-1-a1