Revert "Merge pull request #141 from mjokinenrelex/mjokinen-10568c"

This reverts commit 453350495758b06b02d5f82e113e487d099c19cc, reversing
changes made to 7ba8aa552ed7f5543d8b3fd22879439f536f0b6a.