[PATCH 2/3] sources: Support writing in either the old or new format