Revert "Update #17"

This reverts commit 4fb036c5f9a8ce128209e2598965cb0b06892be1.