Follow-up fix after qa for bug#9916.