We need to be explicit now and can no longer rely on GetParent returning
the right object. Seems like sometimes you get punished for an ugly hack
a bit later than expected.

Change-Id: I145e97ae0ceee741c4128c29a6ca26fad2178cb5