Revert part of Issue #2366631 by colan: File Entity select uploaded file.