ps:CR-183201 revert
Merge pull request #1649 from kaltura/CR-183201

ps:CR-183201 revert