Whoops, fix results of bad merge