Revert https://kaltura.atlassian.net/browse/SUP-2359 due to regression