Revert syntax-only changes