Post-cleanup to bug #11397