Ensure we remove the package phase when destroying.

Change-Id: I75693e0ee1f669db77cf5588c8860ac80a2fbdaa