Spun off as cleanup bug #5894