Follow-up fix for bug 915342 (pushed the original patch without fixing a nit).