Fix regression due to bug 539894