Revert "Merge branch 'key-handler' of github.com:maks/hipster into key-handler"

This reverts commit e1026f0d8a4552a79d8c8755b16b72c3649ff056, reversing
changes made to 118db4227cebac9cd861391dce7c683909237514.
0.13.6