Revert "Merge pull request #379 from olasundell/master"

This reverts commit 5ec216800146df0503685e544210ee1daef8d2a1, reversing
changes made to db65f55284a7e45e586defa1dbe280d5f6f2e37d.