Revert Pull Request 925

Revert pull request 925

- Issues with current attributes in the wild
- Will instead be more explicit in method