Add another necessary cherry-pick for d-i-b