Revert "Merge pull request #1 from segafans/simple"

This reverts commit 1a19effcb211257265b65f8f8d370fd3235b5e6f, reversing
changes made to 37b20492c012fb9f5989792f5987091cc274d8d7.