so that they locate where their classes appear if needed,
otherwise removed

Change-Id: I457542ec4c31f9a4b56a562f588b7c190c18776c