Fixed test failure due to my bad merge.