This reverts commit 4434bc55. It does not make sense to introduce more passes to fix a parsing issue. More importantly: it didn't fix the test!
