gonna spend some time on this now, since it will continue to break master CI until one or the other thing is fixed.

resuming this.