I'd like to avoid having to patch core bootstrap code. If the issue really is in the bootstrap code, we should submit a patch to them. Once our patch is accepted there, we can backport the patch