Revert "Making _enrich_json_with_data more efficient"

This reverts commit 01d93441c0a4f63781bce9ac28856c69be05e6f0.