Note that this was an upstream change by the Pi Foundation folks, rather than something piaware-image-specific.
