:json:

revert-84-002-one-level-defs