fixup! Makes the host aggregate functionality work with cells

Change-Id: Ifa699e732938f485164eac12be8176299163d1ad