Revert SUP-1579
Merge pull request #1003 from kaltura/IX-9.13.0-revertcontextdata

Revert SUP-1579