Revert pull request #35
Merge pull request #36 from sroberts/revert-35

Revert pull request #35