Revert a fourth json_decode() which decodes possible scalars
See D12714, D12680.
Auditors: joshuaspence