Revert Pull Request 925

Revert pull request 925

- Issues with current attributes in the wild
- Will instead be more explicit in method
Merge pull request #1166 from mkly/revert_pull_925_file_helper

Revert Pull Request 925