Drop additional type hints

Follows Ic71064e08

Change-Id: I1a872d12e45d7332c82b494d060facaa4dbee503