Revert more JSON changes