This reverts commit 3f7fd9dc.

As intended and announced in the previous commit message.

Relates to #20