Revert previous changes.

Add check/logging for JSON.parse failure.