... to ODF packages.  Somehow this is even skipped sometimes, but it's
much easier to just turn off the silliness than find out why.

Change-Id: Iff509dfd8325fd517e6434bcb56edbd06a3c27f1