Revert "Correct code as recommended by nickdesaulniers"

This reverts commit 284f23616732667a8e17fb619c5bf5d0ddca074f.