Revert "Merge pull request #200 from mamebro/draft"

This reverts commit 1728817441912e0022377698e10bdb6640bb5870, reversing
changes made to dc9b439d2e0db392e0890974455ae32842344b70.