-- Thanks to naddy@ for doing a full tree build and finding out that nothing broke because of this upgrade.