Fix test failure on merge.