Merge "Revert "Do not update the type of something we already know.""