Opening up this PR so we remember to do this. @mikemhenry I believe you put the pin in, do you know if there's an issue upstream to work out why this duplicate self is happening?