This fixes #7695.  It now regenerates all of the system object before returning them on a push.