Revert "Merge pull request #201 from Shuttlerock/master"

This reverts commit 61eb1c0cb1a1f5a7c585ec4c75f30c99e90919be, reversing
changes made to 0b9eba7078824065a8cd34d0c0bf3b652746777b.