Make compatible w/ ForestDB branch