PLFM-1792: patch production to roll back FileEntity support, until we have a way to reduce hops (during upload to S3).