Revert "Attempt to fix the logic error"

This reverts commit 1bf501f05d75e1ca43af5d23ac233e4915c905e3.