Bug#3850 solved. No new functionality.