Revert "Merge pull request #180 from opennode/oms-339"

This reverts commit 28fae16d016a41dd82318a3e6607c65ff1464762, reversing
changes made to d82e45987a2e30453663727a02a69af6e323f835.