Revert "Merge pull request #21 from orezpraw/rav3n"

This reverts commit 85db6eb410dfe235ebca8c4fdba04e0b2e1c8832, reversing
changes made to f70d99504172bd7741fad17e5e2a8e890e999f5e.