Revert "Merge pull request #139 from thecookiefactory/hotfix-v1.3.2"

This reverts commit 48b7ab9a0d27ccc9fe8afebc085b2db4069a6e30, reversing
changes made to 42f7cc43048593f8a50ee6e25a19defb5d6274f7.