added back old FromJSON case to parse old data