Revert "Merge branch 'pr/3'"

This reverts commit 05e920b2ffa2917fa89bd0ebf12541c480994b78, reversing
changes made to 41457f3eb1243d19cb8d882fec8a4cde3d5b55b5.
helup