Revert 5d09238..d058340

This rolls back to commit 5d092384edde644dcbea6e0f15d5f0c5e572a3fb.
Felahantering i make_expression_tree och infix tillagt