Back out spacing changes to json spirit code