Revert change introduced in #174
Merge pull request #176 from geekwright/revert174

Revert change introduced in #174