Revert to corelib JSON implementation