Revert "Merge pull request #1 from aaronscientiae/master"

This reverts commit 70165df4bf7d03c6c5fd631568f286749adc2854, reversing
changes made to e1f9acc35c79f4fb0bd787bcb48b6fbc443e5b50.
Merge pull request #2 from Vaakapallo/revert_pull

Revert "Merge pull request #1 from aaronscientiae/master"