Revert "Revert "Revert "#16"""

This reverts commit 1ddb50bd39a5b7f61e7b7c1d5c6b64e9892508e7.