OZP-16: Adding back some patches to bootstrap that were removed in a recent change on master.