Restore the YAML functionality lost in the rebase