* Follow-up to 3887ff / r17519.