... caused by stupidly referring to a class member by its subclass.

Change-Id: Icdf7d7953a69d10b62ee78740e42bfe722bdc65b