THis code is already in upstream - is this a github issue?