Revert to old bindings for non-tag keys