Handle opaque keys in a backwards-compatible way

@dianakhuang