Revert "Merge pull request #113 from kwkofler/issue#112"

This reverts commit bfba8c3546fcb9135eed4b8e428cfce5e3366c1a, reversing
changes made to f079eaa7dddc4242a06d61fe4cbd1ac2992c5ba2.