Are these all upstream now? If so, let's make this PR point to a newer version and bottle that.