Revert "Fixed logic bug in #74"

This reverts commit 77a729f1af9bb5a7932a271d15573294121dae84.