Revert change related to org.json api usage.