Switch to getting fetch from self

note to self, remove before merging once upstream change merged