Temporary fix for bug#10508.