This code has moved since this commit - I think there might be a failed rebase somewhere along the line...?