Removing duplicate code and keeping File API consistent
Merge pull request #3407 from dhensby/pulls/file-link

Removing duplicate code and keeping File API consistent