Bug 1070041 - Support both in-tree formats. r=jlund