#1640: Put this off until later.
Merge pull request #3075 from openscholar/1640-save_it_for_later

Put this off file_usage update