Revert "Merge pull request #92 from opennode/oms-484"

This reverts commit d11de68aaed0b67450396feee46330edba8a74b2, reversing
changes made to c3fd01d271c762a4fd7ee344aaba9955155e2a78.