Removed another artifact of bad merge