Comment 3 for bug 872311

Will commit (temporary) fix in rev 456