Revert pull request #3 from jchristopher/patch-2