Revert last commit. Fixed KeyHandlerTest.