r25048: From the archives (patch found in one of my old working trees):