Revert "order by claus... will revert if it messes up"

This reverts commit bb6e84dce0952e044e05bc39f45ceb84f74ceab9.