Futher tuning for bug 3430. Consider this fix experimental.