Revert "CORE-542 Script error when adding comment"

This reverts commit 4308f7acaeab9d178dca3ab4ecaf6d326225e42f.
CORE-542 fix the computed value case in object serialization