This one, too

Change-Id: Ic2c724f39bd71ab181b33532d1ed2f0bcf8f82bd
Revert "This one, too"

Nah, this breaks a --with-package-format=dmg build. Will have to think
harder.

This reverts commit e20640b9592c873169d25869076982a4d5628116.
Revert "Collabora branding"

Nah, this breaks a --with-package-format=dmg build. Will have to think
harder.

This reverts commit e8d629dc06ef79d5db1c80af1b1047f4fcb216b7.

Change-Id: I6b0e1c9a460acfe0304e9bafa5f2114e177bbe50