Revert "Merge pull request #1008 from gregglind/patch-5"

This reverts commit 20cee4a4c8cd2945af4308bb41ccbe192e861081, reversing
changes made to 8b86d8bee5b80075f79dee0bd9579cfdc12c47a0.