Remove the PR from #337 from these, I don't think we need it