Replacing bootstrap patches that were rolled back mistakenly in a recent change.