Revert "Force ORDER BY clause on primary keys if option is undefined"

This reverts commit c950737a0980fcd1874de49a92d8866b6e3c1e34.