| Index: impl/prod/raw_datastore_type_converter.go
 | 
| diff --git a/impl/prod/raw_datastore_type_converter.go b/impl/prod/raw_datastore_type_converter.go
 | 
| index 9799d577233b0c6f3ccc69498fd61ca41ad180f2..1fc439a3f83b90f1c9f91a474bec623e46fb42f2 100644
 | 
| --- a/impl/prod/raw_datastore_type_converter.go
 | 
| +++ b/impl/prod/raw_datastore_type_converter.go
 | 
| @@ -82,7 +82,7 @@ func maybeIndexValue(val interface{}) interface{} {
 | 
|  									toks[i].StringID = sid.Elem().String()
 | 
|  								}
 | 
|  							}
 | 
| -							return ds.NewKeyToks(aid, ns, toks)
 | 
| +							return ds.KeyContext{aid, ns}.NewKeyToks(toks)
 | 
|  						}
 | 
|  						panic(fmt.Errorf(
 | 
|  							"UNKNOWN datastore.indexValue field type: %s", field.Type()))
 | 
| 
 |