Put the casts back in based on #1042