Revert "Build better hierarchy in the YAML."

This reverts commit bdb98633221d13d1e1a7f7a3635d46d35b15cce8.