Revert "BZ-1087941 - JSON entities are not un/wrapped in the REST API"

This reverts commit 7315a725eac3b3ab15d14b4319db1de647d90b36.
(cherry picked from commit cf85fd4ac67f5de934dcf51014db9521bfddc34d)