Revert "Fix DAO to properly enforce desired collation"
Merge pull request #3859 from civicrm/revert-3799-patch-1

Revert "Fix DAO to properly enforce desired collation"