It looks like #35101 is happening again (and probably has been for a while). I think the fix we put in place no longer works with buildship.