Revert "Resolve #17"

This reverts commit 20e1bf702faea7694dd751094bbf94bcec019d49.