Revert "Merge pull request #1308 from spechub/1296-create_comparable_constraints"

This reverts commit 5c8343f2cf38b1697196194e326f7f529b9fa44d, reversing
changes made to fea8c96cbd4c29bed313ba9ed49cdce590c4b5c4.