Can the Two-State Solution be Salvaged?