Revert "Merge branch 'JSONImportExport'"

This reverts commit 312fee2fde0eeb50c7aad5403801ef53a2ee10ac, reversing
changes made to e2bc07abe0f9ee1de2e8f6c5af35a8a7cd496628.