Revert "Merge pull request #609 from jaketri/master" This reverts commit a8857bb27d6f14fb178bf71b956af864fd23af11, reversing changes made to 2f007cb685ab8c5728ece2acb269d6eec3e888e5.