This change broke individual key events, so I'm reverting the change until we can investigate a better fix.