Revert "Merge branch 'master' of https://github.com/mrk187/Adaptor"

This reverts commit 7df83ae300e1d436cdcb0a5f791cfa9ddd097bae, reversing
changes made to d68ee6307dfa51d7d61c143e8df67b7c5ce913e7.