Revert "some changes in comparisons"

This reverts commit 7875df54e7bc8c7bd7a3b1b3047fcd15d5e00b31.