Revert the JSON changes, too much work