Revert "Merge branch 'master' of https://github.com/Smirnoff/emm"

This reverts commit fda692fd8e7f6b2ac9b14f878e81bc0f3282f449, reversing
changes made to 886286e2c540807520ff65954dffb2f6e9f9147c.