Looks like a merge ended up with the old version here?