Backed out changeset 36b79874a9c8, which fixed bug 4775 This change broke individual key events, so I'm reverting the change until we can investigate a better fix.