Revert attempt to improve parsing of &&

The fix itself works, but causes problems in other cases so back it
out for now.

Reopens #2228

This reverts commit 82ee2f8cd4803d63af0e7ee79f834d28edf0abcc.
This reverts commit 0f0d7cb00d016d39d2422f1675cda67ad89cfe0f.
4 files changed