Revert "More comparisons"

This reverts commit c805cecb1ffa181b48b9ac09b13783857a2bcf7a.