Revert "Merge pull request #122 from gdrooid/master"

This reverts commit 31ab169e2fc1ec77ad95264612aa24216d1d1b95, reversing
changes made to 7bd21e441997c126e3027c4e138a404fe4b684a6.

Conflicts:
	tomb