This conditional probably isn't needed any more.