Sync a fix for commit e913f6ef2feff1d91fa824d2516251b28801377d