Zombie typing leads to interesting failures...

Change-Id: I04a2e3af3e0f97911e2bc30d785fc36991e5a5e2