Revert some of the post-cleanup to bug #11397 because it was wrong