Is the Two-State Solution Dead?