There is some unmerged code here.  Not sure what happened but this needs to be fixed.