Workaround entities breakage.

Change-Id: I6f9b59acd77a22774119c6d6fe06fb161e867afc