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

This reverts commit 63d64b450f60a817522cc2d6b8f436d1308edaa3.