Revert "Merge branch 'FileAdd2' into FileAdd"

This reverts commit c5043e3694e65da6409d80c7042b73dbb4a196d6, reversing
changes made to 00f9fd95de235af893f1ce0125c6ec0b1a63ab48.