Revert "Changes for point 4 in review regarding removing '==true'"
This reverts commit 5bd49b24e9b0a578b3c6151c5f86e4db4811c65a