Double File Usage

From #2058.

While working this, I discovered #2853. I'm not sure if Task 2 in the issue is complete as a result.