This time we did preserve this info, and we should not.

Change-Id: If2ddd7a266cd7da5642dc234411ce34e94bd3384