White House moves away from plan for CIA black sites