Revert "Merge pull request #142 from manuel-woelker/1.0.x"

This reverts commit 482b0a39037e252b6b19c97c889cd8b45e17c5fe, reversing
changes made to 053a00b5542ad42721444b00aa65b5a2517bf85f.

This a new feature not meant for this maintenance branch.