Fix bad merge. I undid 83c226d454 by Doris.