Removed all use of addFile... dammit.
Revert "Removed all use of addFile... dammit."

This reverts commit 805ab5818a5fe71fe9375163a8fa501816268fae.