Can we skip the YAML dump/load in an additional commit? (I understand it's there now for historical reasons)