Undo commit 1448c04996e12e3dd3d61c527b4187126cb966ec, this had the side-effect that values are not accessible in the root object (stored in values child object)