Is this still necessary? I think I did some follow-up in the bootstrap branch that deleted this.