Going back to old var-elim order

It's better this way