Revert pull request #31
Merge pull request #32 from sroberts/revert-31

Revert pull request #31