rebake function must always return a set

Change-Id: I3ad186739e9a2e380fe5bac8461d1541df0b2457
Merge "rebake function must always return a set"